SQUASH

product/ERP5/Document/BusinessTemplate.py

@@ -145,6 +145,7 @@ SEPARATELY_EXPORTED_PROPERTY_DICT = {
   "PDF":                 ("pdf",  0, "data"),
   "PyData Script":       ("py",   0, "_body"),
   "Python Script":       ("py",   0, "_body"),
+  "Workflow Script":     ("py",   0, "_body"),
   "PythonScript":        ("py",   0, "_body"),
   "Spreadsheet":         (None,   0, "data"),
   "SQL":                 ("sql",  0, "src"),

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

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_jio_action</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_jio_action</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>
@@ -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):

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -1257,6 +1257,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
             user = uf.getUserById('ERP5TypeTestCase').__of__(uf)
 
             self._callSetUpOnce()
+            self._reindexSite()
 
             # Enable reindexing
             # Do hot reindexing # Does not work