SQUASH

product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/convert_to_ERP5_workflows.xml

@@ -62,7 +62,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Convert workflows to ERP5 Workflows</string> </value>
+            <value> <string>Convert DCWorkflow to ERP5 Workflows</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -79,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/BusinessTemplate_convertToERP5Workflows</string> </value>
+            <value> <string>string:${object_url}/BusinessTemplate_convertAllDCWorkflowToERP5Workflow</string> </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_convertAllDCWorkflowToERP5Workflow.py

-workflow_tool = context.getPortalObject()
+workflow_tool = context.getPortalObject().portal_workflow
 unknown_workflow_id_list = []
 for workflow_id in context.getTemplateWorkflowIdList():
   try:

product/ERP5Type/patches/DCWorkflow.py

@@ -644,7 +644,7 @@ def StateDefinition_getDestinationIdList(self):
   return self.transitions
 def StateDefinition_getDestinationValueList(self):
   if self.transitions: # empty tuple by default
-    return [v for i, v in self.getWorkflow().transitions.iteritems()
+    return [v for i, v in self.getWorkflow().transitions.items()
             if i in self.transitions]
   return []
 def StateDefinition_getStateTypeList(self):