[Erp5-report] r33182 yo - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: yo
Date: Mon Mar  1 14:40:21 2010
New Revision: 33182

URL: http://svn.erp5.org?rev=33182&view=rev
Log:
Move the part of the code that modifies simulation movements from OrderBuilder to DeliveryBuilder, because OrderBuilder makes no relationship between simulation movements and delivery movements.

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

Modified: erp5/trunk/products/ERP5/Document/DeliveryBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryBuilder.py?rev=33182&r1=33181&r2=33182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryBuilder.py [utf8] Mon Mar  1 14:40:21 2010
@@ -157,6 +157,18 @@
                             update_existing_movement=update_existing_movement,
                             force_update=force_update, 
                             activate_kw=activate_kw)
+
+    if update_existing_movement and not force_update:
+      # Important.
+      # Attributes of delivery_movement must not be modified here.
+      # Because we can not change values modified by the user.
+      # Delivery will probably diverge now, but this is not the job of
+      # DeliveryBuilder to resolve such problem.
+      # Use Solver instead.
+      simulation_movement.edit(delivery_ratio=0)
+    else:
+      simulation_movement.edit(delivery_ratio=1)
+
     simulation_movement.edit(delivery_value=delivery_movement,
                              activate_kw=activate_kw)
 

Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=33182&r1=33181&r2=33182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] Mon Mar  1 14:40:21 2010
@@ -662,24 +662,14 @@
                                      force_update=0, activate_kw=None):
     """
       Initialize or update delivery movement properties.
-      Set delivery ratio on simulation movement.
-    """
-    if update_existing_movement == 1 and not force_update:
-      # Important.
-      # Attributes of object_to_update must not be modified here.
-      # Because we can not change values that user modified.
-      # Delivery will probably diverge now, but this is not the job of
-      # DeliveryBuilder to resolve such problem.
-      # Use Solver instead.
-      simulation_movement.edit(delivery_ratio=0)
-    else:
+    """
+    if not update_existing_movement or force_update:
       # Now, only 1 movement is possible, so copy from this movement
       # XXX hardcoded value
       property_dict['quantity'] = simulation_movement.getQuantity()
       property_dict['price'] = simulation_movement.getPrice()
       # Update properties on object (quantity, price...)
       delivery_movement._edit(force_update=1, **property_dict)
-      simulation_movement.edit(delivery_ratio=1)
 
   @UnrestrictedMethod
   def callAfterBuildingScript(self, delivery_list, movement_list=None, **kw):