From 99b8c67bcde41536c40cf0677e0bfc1d2512bdff Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 5 Sep 2007 11:29:46 +0000 Subject: [PATCH] 2007-09-05 Kazuhiko * Remove packing_list.edit() from Delivery_confirm because expansion will be invoked from interaction workflow. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16068 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_trade/Delivery_confirm.xml | 2 -- .../interactions/Container_edit.xml | 6 +++++- .../interactions/PackingListContent_delete.xml | 7 ++++--- .../interactions/PackingListContent_edit.xml | 9 +++++---- .../interactions/PackingList_edit.xml | 8 +++++--- bt5/erp5_trade/bt/change_log | 3 +++ bt5/erp5_trade/bt/revision | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml index f9bcfe6ddb..e7b60aa1b3 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml @@ -74,8 +74,6 @@ if packing_list_state == "draft":\n packing_list,\n \'confirm_action\',\n comment="Initialized by Delivery Builder")\n -\n -packing_list.edit()\n </string> </value> </item> <item> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml index a8bc814803..0017c8b4c2 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml @@ -59,12 +59,16 @@ <key> <string>method_id</string> </key> <value> <list> - <string>_edit</string> + <string>_set.*</string> <string>manage_afterAdd</string> <string>manage_afterClone</string> </list> </value> </item> + <item> + <key> <string>once_per_transaction</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>portal_type_filter</string> </key> <value> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml index 3c16fe153a..d3fd012b9e 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml @@ -61,14 +61,15 @@ </list> </value> </item> + <item> + <key> <string>once_per_transaction</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>portal_type_filter</string> </key> <value> <list> <string>Delivery Cell</string> - <string>Production Packing List Line</string> - <string>Production Report Cell</string> - <string>Production Report Line</string> <string>Purchase Packing List Line</string> <string>Sale Packing List Line</string> </list> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml index b27bb6604b..4e27630c97 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml @@ -59,18 +59,19 @@ <key> <string>method_id</string> </key> <value> <list> - <string>_edit</string> + <string>_set.*</string> </list> </value> </item> + <item> + <key> <string>once_per_transaction</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>portal_type_filter</string> </key> <value> <list> <string>Delivery Cell</string> - <string>Production Packing List Line</string> - <string>Production Report Cell</string> - <string>Production Report Line</string> <string>Purchase Packing List Line</string> <string>Sale Packing List Line</string> </list> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml index 3e249e2560..a33b9e83c2 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml @@ -59,16 +59,18 @@ <key> <string>method_id</string> </key> <value> <list> - <string>edit</string> + <string>_set.*</string> </list> </value> </item> + <item> + <key> <string>once_per_transaction</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>portal_type_filter</string> </key> <value> <list> - <string>Production Packing List</string> - <string>Production Report</string> <string>Purchase Packing List</string> <string>Sale Packing List</string> </list> diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log index 3ab63f2270..df80006d4a 100644 --- a/bt5/erp5_trade/bt/change_log +++ b/bt5/erp5_trade/bt/change_log @@ -1,3 +1,6 @@ +2007-09-05 Kazuhiko +* Remove packing_list.edit() from Delivery_confirm because expansion will be invoked from interaction workflow. + 2007-08-13 Jerome * Remove portal type actions that are now defined as global actions diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 105d7d9ad3..97a55e1d74 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -100 \ No newline at end of file +101 \ No newline at end of file -- 2.30.9