diff --git a/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/scripts/checkConsistency.xml b/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/scripts/checkConsistency.xml index 149a30d09f1907c6db677cff471b73de9c64bbf2..5c539e0c0c5d0443b63a59d3da955d2cc1b35c57 100644 --- a/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/scripts/checkConsistency.xml +++ b/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/scripts/checkConsistency.xml @@ -50,22 +50,8 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -from Products.DCWorkflow.DCWorkflow import ValidationFailed\n -object = state_change[\'object\']\n -N_ = object.Base_translateString\n -\n -check_result = object.checkConsistency()\n -\n -if len(check_result) > 0:\n - check_type = N_(check_result[0][-1])\n - # TODO: use nice url encoding method there instead of replace()\n - check_details = check_result[0][-2].replace(\'<\', \'<\').replace(\'>\', \'>\')\n - raise ValidationFailed, "%s : %s" % (check_type, check_details)\n - - -]]></string> </value> + <value> <string>state_change[\'object\'].Base_checkConsistency()\n +</string> </value> </item> <item> <key> <string>_params</string> </key> diff --git a/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/states/draft.xml b/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/states/draft.xml index 54c4fc28a3670ca4ec3880ad6ec07937b50adb87..ae6b940b9e9efefef26d553fec4b099a23021af6 100644 --- a/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/states/draft.xml +++ b/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/states/draft.xml @@ -28,6 +28,8 @@ <key> <string>transitions</string> </key> <value> <tuple> + <string>close</string> + <string>close_action</string> <string>delete</string> <string>delete_action</string> <string>open</string> diff --git a/bt5/erp5_hr/bt/revision b/bt5/erp5_hr/bt/revision index 25bf17fc5aaabd17402e77a2b16f95fbea7310d2..dec2bf5d6199c7cd0d84f3dc1e76a73ccc336302 100644 --- a/bt5/erp5_hr/bt/revision +++ b/bt5/erp5_hr/bt/revision @@ -1 +1 @@ -18 \ No newline at end of file +19 \ No newline at end of file