From 97c71bccd36f08b6af7a8353c3ef9c4581bfd998 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 4 Nov 2009 15:56:49 +0000 Subject: [PATCH] * propagate more source_payment and destination_payment in default_order_rule and include them in it's category tester. * add more source_* and destination_* in default_delivery_rule's category tester. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30298 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../default_category_tester.xml | 20 +++++++++++++++---- .../portal_rules/default_order_rule.xml | 2 ++ .../default_category_tester.xml | 2 ++ bt5/erp5_trade/bt/revision | 2 +- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml index 8596c859af..b1456eb33d 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule/default_category_tester.xml @@ -53,12 +53,24 @@ <key> <string>tested_property</string> </key> <value> <tuple> - <string>source_section | Source Section</string> - <string>resource | Resource</string> + <string>aggregate | Aggregate</string> + <string>destination | Destination</string> + <string>destination_account | Destination Account</string> + <string>destination_administration | Destination Administration</string> + <string>destination_decision | Destination Decision</string> + <string>destination_function | Destination Function</string> + <string>destination_payment | Destination Payment</string> + <string>destination_project | Destination Project</string> <string>destination_section | Destination Section</string> + <string>resource | Resource</string> <string>source | Source</string> - <string>destination | Destination</string> - <string>aggregate | Aggregate</string> + <string>source_account | Source Account</string> + <string>source_administration | Source Administration</string> + <string>source_decision | Source Decision</string> + <string>source_function | Source Function</string> + <string>source_payment | Source Payment</string> + <string>source_project | Source Project</string> + <string>source_section | Source Section</string> </tuple> </value> </item> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml index f31096e04b..d070545a0d 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml @@ -101,6 +101,7 @@ <string>destination_administration</string> <string>destination_decision</string> <string>destination_function</string> + <string>destination_payment</string> <string>destination_project</string> <string>destination_section</string> <string>incoterm</string> @@ -114,6 +115,7 @@ <string>source_administration</string> <string>source_decision</string> <string>source_function</string> + <string>source_payment</string> <string>source_project</string> <string>source_section</string> <string>start_date</string> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml index 212d5834ba..f25c822455 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule/default_category_tester.xml @@ -90,6 +90,7 @@ <string>destination_administration | Destination Administration</string> <string>destination_decision | Destination Decision</string> <string>destination_function | Destination Function</string> + <string>destination_payment | Destination Payment</string> <string>destination_project | Destination Project</string> <string>destination_section | Destination Section</string> <string>resource | Resource</string> @@ -98,6 +99,7 @@ <string>source_administration | Source Administration</string> <string>source_decision | Source Decision</string> <string>source_function | Source Function</string> + <string>source_payment | Source Payment</string> <string>source_project | Source Project</string> <string>source_section | Source Section</string> </tuple> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 4f1a32f190..96e4f13f48 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -765 \ No newline at end of file +766 \ No newline at end of file -- 2.30.9