From b7288a06a8efa4120855b91aab0c1235e11b69cc Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Wed, 13 Feb 2008 14:08:37 +0000
Subject: [PATCH] * PackingList_copyOrderProperties: remove " 1 or " at the
 beginning of if statement * packing_list_workflow/transitions/stop_action:
 disable stop_action from confirmed state on a Sale Packing List, as start
 transition after script calls the builder, and the default config shouldn't
 allow bypassing it.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19299 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../PackingList_copyOrderProperties.xml       |  2 +-
 .../transitions/stop_action.xml               | 36 ++++++++++++++++++-
 bt5/erp5_trade/bt/revision                    |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
index 09a5fbb3f0..56547488bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
@@ -70,7 +70,7 @@
 packing_list = context\n
 related_order = packing_list.getCausalityValue()\n
 \n
-if 1 or packing_list.getSimulationState() == \'draft\':\n
+if packing_list.getSimulationState() == \'draft\':\n
   packing_list.edit(\n
     comment = related_order.getComment(),\n
     delivery_mode = related_order.getDeliveryMode(),\n
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
index 0f2b34a749..48902da0d3 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/stop_action.xml
@@ -38,7 +38,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -64,4 +64,38 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>python: not(state_change[\'object\'].getPortalType() == "Sale Packing List" and state_change[\'object\'].getSimulationState() == "confirmed")</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 80945bc436..3021b562c4 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-183
\ No newline at end of file
+184
\ No newline at end of file
-- 
2.30.9