[Erp5-report] r32523 kazuhiko - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb 15 06:01:08 2010
New Revision: 32523

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

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml?rev=32523&r1=32522&r2=32523&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] Mon Feb 15 06:01:08 2010
@@ -58,7 +58,12 @@
 parent = movement.getParentValue()\n
 if parent.getPortalType() == \'Applied Rule\':\n
   parent_rule = parent.getSpecialiseValue()\n
-  if parent_rule.getPortalType() not in [\'Order Rule\', \'Delivery Rule\']:\n
+  parent_rule_portal_type = parent_rule.getPortalType()\n
+  if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivering Simulation Rule\']:\n
+    return False\n
+  # XXX can we create invoicing rule for Production Order?\n
+  if parent_rule_portal_type in [\'Delivering Simulation Rule\',] and \\\n
+      parent_rule.getParentValue().getParentValue().getPortalType() not in [\'Order Simulation Rule\']:\n
     return False\n
 \n
 source_section = movement.getSourceSection()\n
@@ -110,6 +115,7 @@
                             <string>_getattr_</string>
                             <string>parent</string>
                             <string>parent_rule</string>
+                            <string>parent_rule_portal_type</string>
                             <string>False</string>
                             <string>source_section</string>
                             <string>destination_section</string>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=32523&r1=32522&r2=32523&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Mon Feb 15 06:01:08 2010
@@ -1,1 +1,1 @@
-330
+331