Merge remote-tracking branch 'upstream/master' into zope4py2

bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/transition_suspend_action.xml

@@ -44,7 +44,8 @@
             <value>
               <tuple>
                 <string>Assignor</string>
-                <string>Assignee: Associate</string>
+                <string>Assignee</string>
+                <string>Associate</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.DeliveryLine.py

@@ -333,14 +333,14 @@ class DeliveryLine(Movement, XMLMatrix, ImmobilisationMovement):
   def manage_afterAdd(self, item, container):
     "if the container is a line too, reindex it"
     if self.meta_type == container.meta_type:
-      container.reindexObject()
+      container.activate(activity="SQLDict").reindexObject()
     return Movement.manage_afterAdd(self, item, container)
 
   security.declarePrivate('manage_beforeDelete')
   def manage_beforeDelete(self, item, container):
     "if the container is a line too, reindex it"
     if self.meta_type == container.meta_type:
-      container.reindexObject()
+      container.activate(activity="SQLDict").reindexObject()
     return Movement.manage_beforeDelete(self, item, container)
 
 # divergence support with solving