--- a/src/pyams_content/shared/common/zmi/workflow.py	Thu Apr 21 18:11:50 2016 +0200
+++ b/src/pyams_content/shared/common/zmi/workflow.py	Thu Apr 21 18:12:30 2016 +0200
@@ -81,9 +81,12 @@
     @property
     def fields(self):
         fields = field.Fields(IWorkflowState).omit('history') + \
-                 field.Fields(IWorkflowPublicationInfo)
+                 field.Fields(IWorkflowPublicationInfo).omit('publication_date', 'publisher')
         workflow = IWorkflow(self.context)
-        if IWorkflowState(self.context).state not in workflow.waiting_states:
+        state = IWorkflowState(self.context).state
+        if state not in workflow.published_states:
+            fields = fields.omit('publication')
+        if state not in workflow.waiting_states:
             fields = fields.omit('state_urgency')
         return fields
 
@@ -95,8 +98,6 @@
         self.widgets['state'].value = self.request.localizer.translate(workflow.get_state_label(state.state))
         self.widgets['state_date'].value = format_datetime(tztime(state.state_date))
         info = IWorkflowPublicationInfo(self.context)
-        if info.publication_date:
-            self.widgets['publication_date'].value = format_datetime(tztime(info.publication_date))
         if info.first_publication_date:
             self.widgets['first_publication_date'].value = format_datetime(tztime(info.first_publication_date))
         if info.publication_effective_date: