we should not modify archived documents, so mergeRevision should not try to...

we should not modify archived documents, so mergeRevision should not try to merge into archived documents.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41897 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/Document.py

@@ -579,7 +579,7 @@ class Document(DocumentExtensibleTraversableMixin, XMLObject, UrlMixin,
       # Find all document with same (reference, version, language)
       kw = dict(portal_type=self.getPortalType(),
                 reference=self.getReference(),
-                where_expression=SQLQuery("validation_state NOT IN ('cancelled', 'deleted')"))
+                where_expression=SQLQuery("validation_state NOT IN ('archived', 'cancelled', 'deleted')"))
       if self.getVersion():
         kw['version'] = self.getVersion()
       if self.getLanguage():