Test merge.

Coding style: new line after colon.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16242 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Base.py

@@ -2875,12 +2875,12 @@ class Base( CopyContainer,
     portal_workflow = getToolByName(self, 'portal_workflow')
     wf = portal_workflow.getWorkflowById('edit_workflow')
     wf_list = list(portal_workflow.getWorkflowsFor(self))
-    if wf is not None: wf_list = [wf] + wf_list
+    if wf is not None:
+      wf_list = [wf] + wf_list
     max_date = None
     for wf in wf_list:
       history = wf.getInfoFor(self, 'history', None)
-      if history is not None:
-        if len(history):
+      if history is not None and len(history):
         date = history[-1].get('time', None)
         # Then get the last line of edit_workflow
         if date > max_date: