diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveVersion.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveVersion.xml index 2ace70cbaa078a877a6fa3d9d7f526fca011d84c..75941bbaff3ad9c7ef044ee5eab572a8a0c30bb1 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveVersion.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/archiveVersion.xml @@ -66,19 +66,24 @@ if not reference:\n portal = document.getPortalObject()\n portal_catalog = portal.portal_catalog\n language = document.getLanguage()\n +search_kw = dict(reference=reference,\n + validation_state=validation_state,\n + # exclude current workflow changed document\n + uid=\'NOT %s\' %document.getUid())\n if not language:\n # If language is None, we have to check is this document\n # is language independent. In this case, archival is possible\n # But if a document exists with same reference and defined\n # language, we can not do anything\n - for old_document in portal_catalog(reference=reference, validation_state=validation_state):\n + for old_document in portal_catalog(**search_kw):\n old_document = old_document.getObject()\n if not old_document.getLanguage():\n old_document.archive()\n return\n \n # We can now archive all documents with same reference and language in published state\n -for old_document in portal_catalog(reference=reference, language=language, validation_state=validation_state):\n +search_kw[\'language\'] = language\n +for old_document in portal_catalog(**search_kw):\n old_document = old_document.getObject()\n old_document.archive()\n </string> </value> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 078cc70a33ea1e7fcadf327c0c65074305c9324c..458361b90b0681303c98bfe5f2e6c8de59229aa3 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -1262 \ No newline at end of file +1263 \ No newline at end of file