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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Feb 23 02:13:28 2010
New Revision: 32981

URL: http://svn.erp5.org?rev=32981&view=rev
Log:
support both legacy Invoice Rule and new Invoice Root Simulation Rule.

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision
    erp5/trunk/products/ERP5/tests/testAccountingRules.py

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml?rev=32981&r1=32980&r2=32981&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml [utf8] Tue Feb 23 02:13:28 2010
@@ -61,6 +61,7 @@
 \n
 parent_rule = parent.getSpecialiseValue()\n
 if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
+                                       \'Invoice Root Simulation Rule\',\n
                                        \'Invoicing Rule\',\n
                                        \'Trade Model Rule\',\n
                                        \'Tax Rule\'):\n

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml?rev=32981&r1=32980&r2=32981&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml [utf8] Tue Feb 23 02:13:28 2010
@@ -61,6 +61,7 @@
 \n
 parent_rule = parent.getSpecialiseValue()\n
 if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
+                                       \'Invoice Root Simulation Rule\',\n
                                        \'Invoicing Rule\'):\n
   return False\n
 \n

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=32981&r1=32980&r2=32981&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Feb 23 02:13:28 2010
@@ -1,1 +1,1 @@
-336
+337

Modified: erp5/trunk/products/ERP5/tests/testAccountingRules.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAccountingRules.py?rev=32981&r1=32980&r2=32981&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccountingRules.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAccountingRules.py [utf8] Tue Feb 23 02:13:28 2010
@@ -1077,8 +1077,8 @@
     applied_rule = applied_rule_list[0]
     self.assertEqual( applied_rule.getPortalType(),
                       self.applied_rule_portal_type)
-    self.assertEqual( applied_rule.getSpecialise(),
-                      'portal_rules/default_invoice_rule')
+    self.assertEqual( applied_rule.getSpecialiseReference(),
+                      'default_invoice_rule')
     self.assertEqual( applied_rule.getCausality(),
                       invoice.getRelativeUrl())
 
@@ -1455,8 +1455,8 @@
     applied_rule = applied_rule_list[0]
 
     self.assertEquals(
-      'portal_rules/default_invoice_rule',
-      applied_rule.getSpecialise()
+      'default_invoice_rule',
+      applied_rule.getSpecialiseReference()
     )
 
     self.assertEquals(