From c24a2975c062a4b80afe2d9985e95e37945287f7 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 12 Feb 2010 00:08:37 +0000 Subject: [PATCH] * define expandable property list on delivery rule, that is now supported. * define matching property on delivery rule and order rule, that is not yet used. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32450 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_rules/default_delivery_rule.xml | 45 +++++++++++++++++++ .../portal_rules/default_order_rule.xml | 4 +- bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml index 360116e573..5f927a21c8 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml @@ -43,10 +43,55 @@ <key> <string>default_reference</string> </key> <value> <string>default_delivery_rule</string> </value> </item> + <item> + <key> <string>expandable_property</string> </key> + <value> + <tuple> + <string>aggregate_list</string> + <string>base_application_list</string> + <string>base_contribution_list</string> + <string>description</string> + <string>destination</string> + <string>destination_account</string> + <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> + <string>price</string> + <string>price_currency</string> + <string>quantity</string> + <string>quantity_unit</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_payment</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> <item> <key> <string>id</string> </key> <value> <string>default_delivery_rule</string> </value> </item> + <item> + <key> <string>matching_property</string> </key> + <value> + <tuple> + <string>delivery</string> + </tuple> + </value> + </item> <item> <key> <string>portal_type</string> </key> <value> <string>Delivery Rule</string> </value> 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 34752f2047..64f306a989 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml @@ -108,7 +108,9 @@ <item> <key> <string>matching_property</string> </key> <value> - <tuple/> + <tuple> + <string>order</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 3e90fddaba..885c7e85d7 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -833 \ No newline at end of file +834 \ No newline at end of file -- 2.30.9