ERP5Workflow: add 'script_' prefix in the script's id when converting it

product/ERP5Workflow/Document/WorkflowScript.py

@@ -35,7 +35,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
 from Products.ERP5Type.id_as_reference import IdAsReferenceMixin
 
-class WorkflowScript(PythonScript, IdAsReferenceMixin("", "prefix")):
+class WorkflowScript(PythonScript, IdAsReferenceMixin("script_", "prefix")):
   meta_type = 'ERP5 Python Script'
   portal_type = 'Workflow Script'
   add_permission = Permissions.AddPortalContent

product/ERP5Workflow/Tool/WorkflowTool.py

@@ -263,7 +263,8 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
       initial_script_name_list = [initial_script_name_list]
     for script_name in initial_script_name_list:
       if script_name:
-        script = getattr(workflow, 'ScriptPrefix_' + script_name, None) or getattr(workflow, script_name, None) or getattr(workflow, 'transition_' + script_name, None)
+        script = getattr(workflow, 'script_' + script_name, None) or \
+                 getattr(workflow, 'transition_' + script_name, None)
         script_path = script.getRelativeUrl()
         script_path_list.append(script_path)
     method(tuple(script_path_list))
@@ -303,10 +304,9 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
         for script_id in dc_workflow_script_list:
           script = dc_workflow_script_list.get(script_id)
           # add a prefix if there is a script & method conflict
-          if hasattr(workflow, script_id):
-            workflow_script = workflow.newContent(id='ScriptPrefix_'+script_id, portal_type='Workflow Script', temp_object=is_temporary)
-          else:
-            workflow_script = workflow.newContent(id=script_id, portal_type='Workflow Script', temp_object=is_temporary)
+          workflow_script = workflow.newContent(id='script_' + script_id,
+                                                portal_type='Workflow Script',
+                                                temp_object=is_temporary)
           workflow_script.setTitle(script.title)
           workflow_script.default_reference = script_id
           workflow_script.setParameterSignature(script._params)