ERP5Site.py: cleanup, allow workflow migration self check.

product/ERP5/ERP5Site.py

@@ -1676,8 +1676,7 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
     if tool.getPortalType() != 'Workflow Tool':
 
       # create new Workflow Tool
-      self._setObject('portal_workflow_new', WorkflowTool())
-      new_tool = getattr(self, 'portal_workflow_new')
+      new_tool = self._setObject('portal_workflow_new', WorkflowTool())
       new_tool._chains_by_type = tool._chains_by_type
 
       # copy-paste operation
@@ -2247,7 +2246,7 @@ class ERP5Generator(PortalGenerator):
     p.portal_caches.updateCache()
     # Workflow Tool migration. It's better to create an ERP5 Workflow Tool from
     # beginning than migrate DC Workflow Tool
-    # p.migrateToPortalWorkflowClass()
+    p.migrateToPortalWorkflowClass()
 
     self.setupLastTools(p, **kw)