From cb633a7596320f093e160f49c040d849edc21dee Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 30 Oct 2009 15:55:46 +0000 Subject: [PATCH] propagate more source_* and destination_* in default_order_rule and include them in it's category tester. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30166 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_rules/default_order_rule.xml | 36 +++++++++++-------- .../default_category_tester.xml | 18 +++++++--- bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 36 insertions(+), 20 deletions(-) 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 d21decd5fa..f31096e04b 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml @@ -93,27 +93,33 @@ <key> <string>expandable_property</string> </key> <value> <tuple> - <string>source</string> - <string>source_section</string> - <string>source_function</string> - <string>source_account</string> - <string>start_date</string> - <string>stop_date</string> + <string>aggregate_list</string> + <string>base_contribution_list</string> + <string>description</string> <string>destination</string> - <string>destination_section</string> - <string>destination_function</string> <string>destination_account</string> - <string>description</string> - <string>resource</string> - <string>variation_category_list</string> - <string>variation_property_dict</string> - <string>base_contribution_list</string> - <string>aggregate_list</string> + <string>destination_administration</string> + <string>destination_decision</string> + <string>destination_function</string> + <string>destination_project</string> + <string>destination_section</string> + <string>incoterm</string> <string>price</string> <string>price_currency</string> <string>quantity</string> <string>quantity_unit</string> - <string>incoterm</string> + <string>resource</string> + <string>source</string> + <string>source_account</string> + <string>source_administration</string> + <string>source_decision</string> + <string>source_function</string> + <string>source_project</string> + <string>source_section</string> + <string>start_date</string> + <string>stop_date</string> + <string>variation_category_list</string> + <string>variation_property_dict</string> </tuple> </value> </item> 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 a129890a8b..212d5834ba 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 @@ -84,12 +84,22 @@ <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_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_project | Source Project</string> + <string>source_section | Source Section</string> </tuple> </value> </item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index cbb5735d83..a4c65e3658 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -760 \ No newline at end of file +761 \ No newline at end of file -- 2.30.9