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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Feb 18 02:37:08 2010
New Revision: 32705

URL: http://svn.erp5.org?rev=32705&view=rev
Log:
fix bugs in select methods to support both legacy and new simulation hierarchy.

Modified:
    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/TransformationSourcingRule_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/TransformationSourcingRule_selectMovement.xml?rev=32705&r1=32704&r2=32705&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] Thu Feb 18 02:37:08 2010
@@ -60,11 +60,12 @@
   parent_applied_rule = movement.getParentValue()\n
   parent_rule = parent_applied_rule.getSpecialiseValue()\n
   return (\n
-    root_rule.getPortalType() in ("Production Order Rule",\n
-                                  "Production Order Simulation Rule") and\\\n
-    (parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
-                                     "Delivering Rule",\n
-                                     "Delivering Simulation Rule")) and\\\n
+    ((root_rule.getPortalType() in ("Production Order Rule",) and\\\n
+      parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
+                                      "Production Order Rule")) or\\\n
+     (root_rule.getPortalType() in ("Production Order Simulation Rule",) and\\\n
+      parent_rule.getPortalType() in ("Transformation Sourcing Rule",\n
+                                      "Delivering Simulation Rule"))) 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=32705&r1=32704&r2=32705&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] Thu Feb 18 02:37:08 2010
@@ -1,1 +1,1 @@
-419
+420