From 9649cd6178af90202fab2b725553ba7d10e605bf Mon Sep 17 00:00:00 2001 From: Alexandre Boeglin <alex@nexedi.com> Date: Fri, 5 Oct 2007 12:07:46 +0000 Subject: [PATCH] - Accounting Transaction does not use simulation - Payment Transaction uses default_invoice_rule git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16863 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_core/Delivery_updateAppliedRule.xml | 6 +++--- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml index 1549e71ad1..3ffcb5485f 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml @@ -72,10 +72,8 @@ delivery_type = context.getPortalType()\n \n applied_rule_dict = {\n - \'Accounting Rule Cell\': \'\', # this one is only used as a template in the Invoice Transaction Rule, and does not need simulation\n - \'Accounting Transaction\': \'default_invoice_rule\',\n -\n \'Pay Sheet Transaction\': \'default_invoice_rule\',\n + \'Payment Transaction\': \'default_invoice_rule\',\n \n \'Purchase Packing List\': \'default_delivery_rule\',\n \'Purchase Invoice Transaction\': \'default_invoice_rule\',\n @@ -84,6 +82,8 @@ applied_rule_dict = {\n \'Sale Packing List\': \'default_delivery_rule\',\n \'Sale Invoice Transaction\': \'default_invoice_rule\',\n \n + \'Accounting Rule Cell\': None,\n + \'Accounting Transaction\': None,\n \'Production Packing List\': None,\n \'Production Report\': None,\n \n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 03164581e1..84ccffd556 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -503 \ No newline at end of file +505 \ No newline at end of file -- 2.30.9