[Erp5-report] r24124 - in /erp5/trunk/products/ERP5: ./ Document/

[nobody at svn.erp5.org]

Author: seb
Date: Thu Oct  9 16:53:13 2008
New Revision: 24124

URL: http://svn.erp5.org?rev=24124&view=rev
Log:
propagate activate_kw to simulation_movement reindexing activities
when we call build with activate_kw

Modified:
    erp5/trunk/products/ERP5/Document/DeliveryBuilder.py
    erp5/trunk/products/ERP5/Document/OrderBuilder.py
    erp5/trunk/products/ERP5/MovementGroup.py

Modified: erp5/trunk/products/ERP5/Document/DeliveryBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryBuilder.py?rev=24124&r1=24123&r2=24124&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryBuilder.py (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryBuilder.py Thu Oct  9 16:53:13 2008
@@ -144,7 +144,7 @@
   def _setDeliveryMovementProperties(self, delivery_movement,
                                      simulation_movement, property_dict,
                                      update_existing_movement=0,
-                                     force_update=0):
+                                     force_update=0, activate_kw=None):
     """
       Initialize or update delivery movement properties.
       Set delivery ratio on simulation movement.
@@ -155,8 +155,10 @@
                             self, delivery_movement,
                             simulation_movement, property_dict,
                             update_existing_movement=update_existing_movement,
-                            force_update=force_update)
-    simulation_movement.edit(delivery_value=delivery_movement)
+                            force_update=force_update, 
+                            activate_kw=activate_kw)
+    simulation_movement.edit(delivery_value=delivery_movement,
+                             activate_kw=activate_kw)
 
   # Simulation consistency propagation
   security.declareProtected(Permissions.ModifyPortalContent,

Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=24124&r1=24123&r2=24124&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py Thu Oct  9 16:53:13 2008
@@ -629,12 +629,12 @@
         self._setDeliveryMovementProperties(
                             object_to_update, movement, property_dict,
                             update_existing_movement=update_existing_movement,
-                            force_update=force_update)
+                            force_update=force_update, activate_kw=activate_kw)
 
   def _setDeliveryMovementProperties(self, delivery_movement,
                                      simulation_movement, property_dict,
                                      update_existing_movement=0,
-                                     force_update=0):
+                                     force_update=0, activate_kw=None):
     """
       Initialize or update delivery movement properties.
       Set delivery ratio on simulation movement.

Modified: erp5/trunk/products/ERP5/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/MovementGroup.py?rev=24124&r1=24123&r2=24124&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/MovementGroup.py (original)
+++ erp5/trunk/products/ERP5/MovementGroup.py Thu Oct  9 16:53:13 2008
@@ -466,10 +466,13 @@
     return self.__movement_list[0].getVariationCategoryList(
         omit_optional_variation=omit_optional_variation, **kw)
 
-  def edit(self, **kw):
+  def edit(self, activate_kw=None, **kw):
     """
       Written in order to call edit in delivery builder,
       as it is the generic way to modify object.
+
+      activate_kw is here for compatibility reason with Base.edit,
+      it will not be used here.
     """
     for key in kw.keys():
       if key == 'delivery_ratio':