[Erp5-report] r32532 kazuhiko - in /erp5/trunk/bt5/erp5_mrp: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb 15 07:33:55 2010
New Revision: 32532

URL: http://svn.erp5.org?rev=32532&view=rev
Log:
fix bug of supporting new simulation hierarchy.

Modified:
    erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
    erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
    erp5/trunk/bt5/erp5_mrp/bt/revision

Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml?rev=32532&r1=32531&r2=32532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/SimulationMovement_testTransformationRule.xml [utf8] Mon Feb 15 07:33:55 2010
@@ -72,12 +72,14 @@
 \n
 # Test movement\n
 if (root_rule is None or\n
-    root_rule.getPortalType() != "Production Order Rule" or\n
+    root_rule.getPortalType() not in ("Production Order Rule", "Production Order Simulation Rule") or\n
     order is None or\n
     movement.getResourceValue() is None or\n
     movement.getSourceValue() is None or\n
-    movement.getResourceValue() != root_movement.getResourceValue() or\n
-    movement.getPath() == root_movement.getPath()):\n
+    movement.getResourceValue() != root_movement.getResourceValue()):\n
+  return False\n
+if root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+    movement.getPath() == root_movement.getPath():\n
   return False\n
 \n
 supply_chain = rule.getSupplyChain(movement.getParentValue())\n

Modified: erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml?rev=32532&r1=32531&r2=32532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml [utf8] Mon Feb 15 07:33:55 2010
@@ -60,9 +60,11 @@
   parent_applied_rule = movement.getParentValue()\n
   parent_rule = parent_applied_rule.getSpecialiseValue()\n
   return (\n
-    root_rule.getPortalType() == "Production Order Rule" and\\\n
-    (parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
-                                     "Delivering Rule")) and\\\n
+    ((root_rule.getPortalType() == "Production Order Rule" and\\\n
+      (parent_rule.getPortalType() in ("Transformation Sourcing Rule",))) or \\\n
+     (root_rule.getPortalType() == "Production Order Simulation Rule" and\\\n
+      (parent_rule.getPortalType() in ("Delivering Simulation Rule",))))\\\n
+     and\\\n
     root_movement.getSimulationState() == "confirmed"\n
   )\n
 \n

Modified: erp5/trunk/bt5/erp5_mrp/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/revision?rev=32532&r1=32531&r2=32532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] Mon Feb 15 07:33:55 2010
@@ -1,1 +1,1 @@
-416
+417