From 461e716a90b15384ceef2b8795080646bf78a329 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 30 Dec 2010 23:31:04 +0000
Subject: [PATCH] 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/product/ERP5/Document/Document.py b/product/ERP5/Document/Document.py
index a9e1dac3e6..284937f8bf 100644
--- a/product/ERP5/Document/Document.py
+++ b/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():
--
GitLab