[Erp5-report] r32524 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb 15 06:08:14 2010
New Revision: 32524

URL: http://svn.erp5.org?rev=32524&view=rev
Log:
to support both new and old simulation hierarchy.

Modified:
    erp5/trunk/products/ERP5/Document/DeliveryRule.py
    erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py
    erp5/trunk/products/ERP5/Document/TaxLineDeliveryMovementGroup.py
    erp5/trunk/products/ERP5/Document/TransformationModelRule.py
    erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py

Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=32524&r1=32523&r2=32524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] Mon Feb 15 06:08:14 2010
@@ -197,6 +197,7 @@
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
       business_path, current_property_dict):
     """Delivery specific update dict"""
+    # 'order' category is deprecated. it is kept for compatibility.
     return {
       'order': movement.getRelativeUrl(),
       'delivery': movement.getRelativeUrl(),

Modified: erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py?rev=32524&r1=32523&r2=32524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py [utf8] Mon Feb 15 06:08:14 2010
@@ -43,7 +43,10 @@
     return True, property_dict
 
   def _getRequirementList(self, movement):
+    # 'order' category is deprecated. it is kept for compatibility.
     order_value = movement.getOrderValue()
+    if order_value is None:
+      order_value = movement.getDeliveryValue()
     requirement_list = []
     if order_value is not None:
       if 'Line' in order_value.getPortalType():

Modified: erp5/trunk/products/ERP5/Document/TaxLineDeliveryMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TaxLineDeliveryMovementGroup.py?rev=32524&r1=32523&r2=32524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TaxLineDeliveryMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TaxLineDeliveryMovementGroup.py [utf8] Mon Feb 15 06:08:14 2010
@@ -99,7 +99,10 @@
 
       # in case of invoice rule (ie. starting from Invoice)
       if delivery_line is None:
+        # 'order' category is deprecated. it is kept for compatibility.
         delivery_line = applied_rule.getParentValue().getOrderValue()
+        if delivery_line is not None:
+          delivery_line = applied_rule.getParentValue().getDeliveryValue()
 
       # in case of invoicing rule (ie. starting from Order)
       if delivery_line is None:

Modified: erp5/trunk/products/ERP5/Document/TransformationModelRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationModelRule.py?rev=32524&r1=32523&r2=32524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationModelRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationModelRule.py [utf8] Mon Feb 15 06:08:14 2010
@@ -145,7 +145,10 @@
     if movement is None and applied_rule is not None:
       movement = applied_rule.getParentValue()
 
+    # 'order' category is deprecated. it is kept for compatibility.
     order_movement = movement.getRootSimulationMovement().getOrderValue()
+    if order_movement is None:
+      order_movement = movement.getRootSimulationMovement().getDeliveryValue()
     explanation = self.getExplanationValue(movement=movement,
                                            applied_rule=applied_rule)
     # find the line of order recursively
@@ -196,8 +199,12 @@
     if applied_rule is not None:
       return applied_rule.getRootAppliedRule().getCausalityValue()
     else:
-      return movement.getRootSimulationMovement()\
-             .getOrderValue().getExplanationValue()
+      root_simulation_movement = movement.getRootSimulationMovement()
+      # 'order' category is deprecated. it is kept for compatibility.
+      order = root_simulation_movement.getOrderValue()
+      if order is None:
+        order = root_simulation_movement.getDeliveryValue()
+      return order.getExplanationValue()
 
   def getHeadProductionPathValueList(self, transformation, business_process):
     """

Modified: erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py?rev=32524&r1=32523&r2=32524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] Mon Feb 15 06:08:14 2010
@@ -107,8 +107,11 @@
     """
     Get transformation related to used by the applied rule.
     """
-    production_order_movement = movement.getRootSimulationMovement().\
-                                                   getOrderValue()
+    root_simulation_movement = movement.getRootSimulationMovement()
+    # 'order' category is deprecated. it is kept for compatibility.
+    production_order_movement = root_simulation_movement.getOrderValue()
+    if production_order_movement is None:
+      production_order_movement = root_simulation_movement.getDeliveryValue()
     # XXX Acquisition can be use instead
     parent_uid = production_order_movement.getParentUid()
     explanation_uid = production_order_movement.getExplanationUid()