Folder_generateWorkflowReport.xml: resolve conflict.

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml

@@ -66,16 +66,17 @@ for portal_type in context.allowedContentTypes():\n
   portal_type_id = portal_type.getId()\n
   portal_type_translated_title_dict[portal_type_id] = translateString(portal_type.getTitle())\n
   for workflow in getWorkflowsFor(portal_type_id):\n
-    state_container = getattr(workflow, \'states\', None)\n
+    state_container = workflow.getStateValuesList()\n
     if state_container is not None and len(state_container) > 1:\n
-      state_var = workflow.state_var\n
+      state_var = workflow.getStateVariable()\n
+      if state_var is None:\n
+        state_var = \'state\'\n
       workflow_id = workflow.getId()\n
       workflow_translated_title_dict[workflow_id] = translateString(workflow.title)\n
       type_state_variable_workflow_dict[(portal_type_id, state_var)] = workflow_id\n
       state_count_dict = type_workflow_state_count_dict_dict.setdefault((portal_type_id, workflow_id), {})\n
       translated_state_title_dict = workflow_translated_state_title_dict.setdefault(workflow_id, {})\n
-      for state in state_container.objectValues():\n
-        state_id = state.getId()\n
+      for state_id, state in state_container.items():\n
         # TODO: support workflow-specific translations\n
         translated_state_title_dict[state_id] = translateString(state.title)\n
         state_count_dict[state_id] = 0\n