From c6db02412849bc0181f08edff06ae652c8b9e0f1 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Sat, 17 Feb 2007 02:52:29 +0000 Subject: [PATCH] Added Apply Trade Condition action. Updated name conventions. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12839 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Task/apply_trade_condition.xml | 89 ++++++++++ ...st.xml => jump_to_related_task_report.xml} | 2 +- .../portal_types/Task/profile_view.xml | 2 +- .../allowed_content_types.xml | 2 + .../TaskTradeCondition_viewProfile.xml | 168 ------------------ bt5/erp5_project/bt/revision | 2 +- ...late_portal_type_allowed_content_type_list | 2 + 7 files changed, 96 insertions(+), 171 deletions(-) create mode 100644 bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml rename bt5/erp5_project/ActionTemplateItem/portal_types/Task/{jump_to_related_purchase_packing_list.xml => jump_to_related_task_report.xml} (96%) delete mode 100644 bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskTradeCondition_viewProfile.xml diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml new file mode 100644 index 0000000000..39255398e1 --- /dev/null +++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml @@ -0,0 +1,89 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.CMFCore.ActionInformation</string> + <string>ActionInformation</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>action</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>category</string> </key> + <value> <string>object_action</string> </value> + </item> + <item> + <key> <string>condition</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>icon</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>apply_trade_condition</string> </value> + </item> + <item> + <key> <string>permissions</string> </key> + <value> + <tuple> + <string>View</string> + </tuple> + </value> + </item> + <item> + <key> <string>priority</string> </key> + <value> <float>11.0</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Apply Trade Condition</string> </value> + </item> + <item> + <key> <string>visible</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.CMFCore.Expression</string> + <string>Expression</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>string:${object_url}/SaleOrder_applySaleTradeCondition</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_purchase_packing_list.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml similarity index 96% rename from bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_purchase_packing_list.xml rename to bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml index 39296317d0..4c787d27ea 100644 --- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_purchase_packing_list.xml +++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml @@ -42,7 +42,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>jump_to_related_purchase_packing_list</string> </value> + <value> <string>jump_to_related_task_report</string> </value> </item> <item> <key> <string>permissions</string> </key> diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml index 7fa4b38019..0e52e79154 100644 --- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml +++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/TaskTradeCondition_viewProfile</string> </value> + <value> <string>string:${object_url}/Task_viewProfile</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 0addbe0808..ea273e1cc6 100644 --- a/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_project/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -31,7 +31,9 @@ <item>Requirement Document</item> </portal_type> <portal_type id="Task"> + <item>Discount</item> <item>Task Line</item> + <item>Payment Condition</item> </portal_type> <portal_type id="Task Module"> <item>Task</item> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskTradeCondition_viewProfile.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskTradeCondition_viewProfile.xml deleted file mode 100644 index 397cc053d9..0000000000 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskTradeCondition_viewProfile.xml +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Form.Form</string> - <string>ERP5Form</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <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/> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> <string>Base_edit</string> </value> - </item> - <item> - <key> <string>encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>enctype</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <list> - <string>left</string> - <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> - </list> - </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> - <value> - <list> - <string>my_source_title</string> - <string>my_source_section_title</string> - <string>my_source_decision_title</string> - <string>my_source_administration_title</string> - <string>my_source_payment_title</string> - <string>my_source_project_title</string> - </list> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list> - <string>my_destination_title</string> - <string>my_destination_section_title</string> - <string>my_destination_decision_title</string> - <string>my_destination_administration_title</string> - <string>my_destination_payment_title</string> - <string>my_destination_project_title</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>TaskTradeCondition_viewProfile</string> </value> - </item> - <item> - <key> <string>method</string> </key> - <value> <string>POST</string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>TradeCondition_viewProfile</string> </value> - </item> - <item> - <key> <string>pt</string> </key> - <value> <string>form_view</string> </value> - </item> - <item> - <key> <string>row_length</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>stored_encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Profile</string> </value> - </item> - <item> - <key> <string>unicode_mode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>update_action</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 565f1b06a1..7df2addf7b 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -231 \ No newline at end of file +232 \ No newline at end of file diff --git a/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list index 3fde2355ec..22823fd3d9 100644 --- a/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_project/bt/template_portal_type_allowed_content_type_list @@ -20,4 +20,6 @@ Requirement | Requirement Task Module | Task Task Report Module | Task Report Task Report | Task Report Line +Task | Discount +Task | Payment Condition Task | Task Line \ No newline at end of file -- 2.30.9