Merge branch 'ivan_base'

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml

@@ -27,15 +27,15 @@
         <item>
             <key> <string>after_script_name</string> </key>
             <value>
-              <tuple/>
+              <list>
+                <string>Document_setContributor</string>
+              </list>
             </value>
         </item>
         <item>
             <key> <string>before_commit_script_name</string> </key>
             <value>
-              <list>
-                <string>Document_setContributor</string>
-              </list>
+              <tuple/>
             </value>
         </item>
         <item>

product/ERP5OOo/tests/testDms.py

@@ -1143,12 +1143,12 @@ class TestDocument(TestDocumentMixin):
                    version = '003',
                    language = 'bg',
                    reference = 'tlv-test-doc-1')
+    self.login()
     contributor_list = document_4.getContributorValueList()
     contributor_list.append(person1)
     document_4.setContributorValueList(contributor_list)
     document_4.publish()
     self.tic()
-    self.login()
 
     # search arbitrary word
     kw = {'searchabletext_any': 'software'}