From 66b6b76e1bcd3d855bf8a4d2f5051cc52c32878a Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Fri, 5 Nov 2010 09:50:46 +0000
Subject: [PATCH] revert 39917 as JP want document_publication_workflow to be
 used here (and fixed if required)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39957 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../workflow_chain_type.xml                                 | 4 ++--
 bt5/erp5_discussion/bt/revision                             | 2 +-
 .../bt/template_portal_type_workflow_chain_list             | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 1ad08e5062..8c67622035 100644
--- a/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,10 +1,10 @@
 <workflow_chain>
  <chain>
   <type>Discussion Post</type>
-  <workflow>document_conversion_interaction_workflow, document_security_interaction_workflow, edit_workflow, publication_workflow</workflow>
+  <workflow>document_conversion_interaction_workflow, document_publication_workflow, document_security_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Discussion Thread</type>
-  <workflow>document_conversion_interaction_workflow, document_security_interaction_workflow, edit_workflow, publication_workflow</workflow>
+  <workflow>document_conversion_interaction_workflow, document_publication_workflow, document_security_interaction_workflow, edit_workflow</workflow>
  </chain>
 </workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_discussion/bt/revision b/bt5/erp5_discussion/bt/revision
index 2fb681e3f9..ea70ce0134 100644
--- a/bt5/erp5_discussion/bt/revision
+++ b/bt5/erp5_discussion/bt/revision
@@ -1 +1 @@
-71
\ No newline at end of file
+72
diff --git a/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list b/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list
index 22eec023c5..76057bf61a 100644
--- a/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list
@@ -1,8 +1,8 @@
 Discussion Post | document_conversion_interaction_workflow
+Discussion Post | document_publication_workflow
 Discussion Post | document_security_interaction_workflow
 Discussion Post | edit_workflow
-Discussion Post | publication_workflow
 Discussion Thread | document_conversion_interaction_workflow
+Discussion Thread | document_publication_workflow
 Discussion Thread | document_security_interaction_workflow
-Discussion Thread | edit_workflow
-Discussion Thread | publication_workflow
\ No newline at end of file
+Discussion Thread | edit_workflow
\ No newline at end of file
-- 
2.30.9