diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml index 9680cf294da14fdfbcb9c5a004c345a8d9d7eecd..abeb91dd0c0431cf8225fea0582ad3d6f7459599 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml @@ -102,7 +102,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python:(here.getCausalityState() not in (\'building\',\'diverged\')) and (here.getPortalType() != \'Sale Packing List\' or here.getContainerState() == \'packed\')</string> </value> + <value> <string>python: here.getCausalityState() not in (\'building\', \'diverged\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml index a861883266c4d8a31c6b24fedfc99285c8ac22bc..e3c2ba1d863f01ffbc893873aa7416032eb912dc 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml @@ -103,7 +103,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python:(here.getCausalityState() not in (\'building\',\'diverged\')) and (here.getPortalType() != \'Sale Packing List\' or here.getContainerState() == \'packed\')</string> </value> + <value> <string>python: here.getCausalityState() not in (\'building\', \'diverged\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index e41567feb87fd40d6e88e91674e66a77a5074304..1380537bfd769da6c47bce5c91a7c45a57e7df7c 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -384 \ No newline at end of file +385 \ No newline at end of file