diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml index cd22abe76507b3deb50ddac5491bb1d69e70a702..603c4370c4c5c620890d3467cf6935db85dcb175 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml @@ -108,7 +108,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: \'externe\' not in here.getSource() or here.isDematerialization()</string> </value> + <value> <string>python: (\'externe\' not in here.getSource() and \'auxiliaire\' not in here.getSource()) or here.isDematerialization()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml index eba2fbf2a2e6adf47ab6032ab7a611cc7c3d73b9..109c844f8976bc2523e87bfcb1fc1ececcada7bf 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/start_action.xml @@ -108,7 +108,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: \'externe\' in here.getSource() and not here.isDematerialization()</string> </value> + <value> <string>python: (\'externe\' in here.getSource() or (\'auxiliaire\' in here.getSource() and \'circulation\' in here.getSource())) and not here.isDematerialization()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index e59f0632ab19b456e3df415e223418bb600b8ab4..0552576c870884d40c4101e045c07fcf945e552e 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -658 \ No newline at end of file +669 \ No newline at end of file