From ed2e583363533134c32d29568cbb40775f0b899e Mon Sep 17 00:00:00 2001 From: Alexandre Boeglin <alex@nexedi.com> Date: Fri, 16 Nov 2007 17:58:29 +0000 Subject: [PATCH] as these rules used to return 0, and as it is now the default behaviour when no script is defined, these scripts are no longer required git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17657 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_rules/default_delivery_rule.xml | 16 +- .../portal_rules/default_order_rule.xml | 16 +- .../DeliveryRule_testContextPortalType.xml | 147 ------------------ .../OrderRule_testContextPortalType.xml | 147 ------------------ bt5/erp5_trade/bt/revision | 2 +- 5 files changed, 27 insertions(+), 301 deletions(-) delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_testContextPortalType.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_testContextPortalType.xml 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 2629cd3dfc..65109e03da 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_delivery_rule.xml @@ -21,6 +21,12 @@ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> + <item> + <key> <string>_identity_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>_mt_index</string> </key> <value> @@ -33,6 +39,12 @@ <none/> </value> </item> + <item> + <key> <string>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>_tree</string> </key> <value> @@ -54,9 +66,7 @@ <item> <key> <string>test_method_id</string> </key> <value> - <tuple> - <string>DeliveryRule_testContextPortalType</string> - </tuple> + <tuple/> </value> </item> <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 8bea35069e..2767e4b2d0 100644 --- a/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_rules/default_order_rule.xml @@ -21,6 +21,12 @@ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> + <item> + <key> <string>_identity_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>_mt_index</string> </key> <value> @@ -33,6 +39,12 @@ <none/> </value> </item> + <item> + <key> <string>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>_tree</string> </key> <value> @@ -54,9 +66,7 @@ <item> <key> <string>test_method_id</string> </key> <value> - <tuple> - <string>OrderRule_testContextPortalType</string> - </tuple> + <tuple/> </value> </item> <item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_testContextPortalType.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_testContextPortalType.xml deleted file mode 100644 index f3bb2aac9f..0000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryRule_testContextPortalType.xml +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>return context.getPortalType() in [\'Sale Packing List\']\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>rule</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>rule</string> - <string>_getattr_</string> - <string>context</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>DeliveryRule_testContextPortalType</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_testContextPortalType.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_testContextPortalType.xml deleted file mode 100644 index bf63e0abe5..0000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderRule_testContextPortalType.xml +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>return context.getPortalType() in [\'Sale Order\']\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>rule</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>rule</string> - <string>_getattr_</string> - <string>context</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>OrderRule_testContextPortalType</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index bc768da71a..5d1277e790 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -146 \ No newline at end of file +147 \ No newline at end of file -- 2.30.9