[Erp5-report] r33434 kazuhiko - in /erp5/trunk/bt5/erp5_legacy_tax_system: SkinTemplateItem...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Mar  5 11:12:12 2010
New Revision: 33434

URL: http://svn.erp5.org?rev=33434&view=rev
Log:
no need to support new simulation hierarchy for legacy tax rule.

Modified:
    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_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=33434&r1=33433&r2=33434&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] Fri Mar  5 11:12:12 2010
@@ -58,12 +58,7 @@
 parent = movement.getParentValue()\n
 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 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
-      parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
+  if parent_rule.getPortalType() not in [\'Delivery Rule\', \'Order Rule\']:\n
     return False\n
 \n
 return True\n
@@ -109,7 +104,6 @@
                             <string>_getattr_</string>
                             <string>parent</string>
                             <string>parent_rule</string>
-                            <string>parent_rule_portal_type</string>
                             <string>False</string>
                             <string>True</string>
                           </tuple>

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=33434&r1=33433&r2=33434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_legacy_tax_system/bt/revision [utf8] Fri Mar  5 11:12:12 2010
@@ -1,1 +1,1 @@
-12
+13