From 5a8af8527c74bee8cd974020046ae4961b0a4d6c Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 23 Feb 2010 01:13:28 +0000
Subject: [PATCH] support both legacy Invoice Rule and new Invoice Root
 Simulation Rule.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32981 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../SimulationMovement_testInvoiceTransactionRule.xml     | 1 +
 .../SimulationMovement_testTradeModelRule.xml             | 1 +
 bt5/erp5_invoicing/bt/revision                            | 2 +-
 product/ERP5/tests/testAccountingRules.py                 | 8 ++++----
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
index d00e96a4ed..2c38fc6764 100644
--- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
+++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
@@ -61,6 +61,7 @@ if parent.getPortalType() != \'Applied Rule\':\n
 \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
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
index c2513cc52e..1d7cadf561 100644
--- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
+++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
@@ -61,6 +61,7 @@ if parent.getPortalType() != \'Applied Rule\':\n
 \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
diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision
index d61d31715d..ef491079a3 100644
--- a/bt5/erp5_invoicing/bt/revision
+++ b/bt5/erp5_invoicing/bt/revision
@@ -1 +1 @@
-336
\ No newline at end of file
+337
\ No newline at end of file
diff --git a/product/ERP5/tests/testAccountingRules.py b/product/ERP5/tests/testAccountingRules.py
index 46b5b218f8..9915d82a1e 100644
--- a/product/ERP5/tests/testAccountingRules.py
+++ b/product/ERP5/tests/testAccountingRules.py
@@ -1077,8 +1077,8 @@ class TestAccountingRules(TestAccountingRulesMixin, ERP5TypeTestCase):
     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 @@ class TestAccountingRules(TestAccountingRulesMixin, ERP5TypeTestCase):
     applied_rule = applied_rule_list[0]
 
     self.assertEquals(
-      'portal_rules/default_invoice_rule',
-      applied_rule.getSpecialise()
+      'default_invoice_rule',
+      applied_rule.getSpecialiseReference()
     )
 
     self.assertEquals(
-- 
2.30.9