[Erp5-report] r41897 kazuhiko - /erp5/trunk/products/ERP5/Document/Document.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec 31 00:31:04 2010
New Revision: 41897

URL: http://svn.erp5.org?rev=41897&view=rev
Log:
we should not modify archived documents, so mergeRevision should not try to merge into archived documents.

Modified:
    erp5/trunk/products/ERP5/Document/Document.py

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=41897&r1=41896&r2=41897&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Document.py [utf8] Fri Dec 31 00:31:04 2010
@@ -579,7 +579,7 @@ class Document(DocumentExtensibleTravers
       # 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():