[Erp5-report] r20496 - /erp5/trunk/products/ERP5/Document/OrderRule.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Apr 14 16:48:55 2008
New Revision: 20496

URL: http://svn.erp5.org?rev=20496&view=rev
Log:
instead of hardconding Tax Line, use order movement type list (which should not
contain tax lines)

Modified:
    erp5/trunk/products/ERP5/Document/OrderRule.py

Modified: erp5/trunk/products/ERP5/Document/OrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderRule.py?rev=20496&r1=20495&r2=20496&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderRule.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderRule.py Mon Apr 14 16:48:55 2008
@@ -79,7 +79,8 @@
     immutable_movement_list = []
     order = applied_rule.getDefaultCausalityValue()
     if order is not None:
-      order_movement_list = order.getMovementList()
+      order_movement_list = order.getMovementList(
+                     portal_type=order.getPortalOrderMovementTypeList()):
       # check existing movements
       for movement in applied_rule.contentValues(portal_type=movement_type):
         if (not movement.getLastExpandSimulationState() in
@@ -106,9 +107,6 @@
           order_movement_dict[order_movement.getPath()] = s_m
       # Create or modify movements
       for movement in order_movement_list:
-        # FIXME: to be improved later
-        if  movement.getPortalType() not in ('Tax Line', ):
-          continue
         related_order = order_movement_dict.get(movement.getPath(), None)
         if related_order is None:
           related_order = movement.getOrderRelatedValue()