Commit b7288a06 authored by Alexandre Boeglin's avatar Alexandre Boeglin

* 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
parent ffaf0bda
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
packing_list = context\n packing_list = context\n
related_order = packing_list.getCausalityValue()\n related_order = packing_list.getCausalityValue()\n
\n \n
if 1 or packing_list.getSimulationState() == \'draft\':\n if packing_list.getSimulationState() == \'draft\':\n
packing_list.edit(\n packing_list.edit(\n
comment = related_order.getComment(),\n comment = related_order.getComment(),\n
delivery_mode = related_order.getDeliveryMode(),\n delivery_mode = related_order.getDeliveryMode(),\n
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<none/> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,4 +64,38 @@ ...@@ -64,4 +64,38 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
183 184
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment