[Erp5-report] r32983 kazuhiko - in /erp5/trunk/bt5: erp5_invoicing/SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 23 02:33:57 CET 2010
Author: kazuhiko
Date: Tue Feb 23 02:33:56 2010
New Revision: 32983
URL: http://svn.erp5.org?rev=32983&view=rev
Log:
support both legacy Delivery Rule and new Delivery Root Simulation Rule.
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml
erp5/trunk/bt5/erp5_legacy_tax_system/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=32983&r1=32982&r2=32983&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] Tue Feb 23 02:33:56 2010
@@ -59,7 +59,7 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n
return False\n
# XXX can we create invoicing rule for Production Order?\n
if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=32983&r1=32982&r2=32983&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Feb 23 02:33:56 2010
@@ -1,1 +1,1 @@
-337
+338
Modified: erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml?rev=32983&r1=32982&r2=32983&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_legacy_tax_system/SkinTemplateItem/portal_skins/erp5_legacy_tax_system/SimulationMovement_testTaxRule.xml [utf8] Tue Feb 23 02:33:56 2010
@@ -59,7 +59,7 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n
return False\n
# XXX can we create tax rule for Production Order?\n
if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
Modified: erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision?rev=32983&r1=32982&r2=32983&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] Tue Feb 23 02:33:56 2010
@@ -1,1 +1,1 @@
-11
+12
More information about the Erp5-report
mailing list