diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateWorkflowChainItem/workflow_chain_type.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateWorkflowChainItem/workflow_chain_type.xml
deleted file mode 100755
index bcdf06d7d097ff6490c86b6cf00f47ce0c08a124..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateWorkflowChainItem/workflow_chain_type.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<workflow_chain>
- <chain>
-  <type>portal_type_workflow_chain/Address</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Agent</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Agent Privilege</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Alarm</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Alarm Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Applied Rule</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Assignment</type>
-  <workflow>assignment_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Bank Account</type>
-  <workflow>bank_account_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Base Category</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Career</type>
-  <workflow>career_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Category</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Category Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/ChatAddress</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Credit Card</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Currency</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Currency Exchange Line</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Currency Module</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Delivery Builder</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Delivery Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Document</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Email</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Favorite</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Fax</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/File</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Folder</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Image</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Link</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Mapped Value</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/News Item</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Order Builder</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Order Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Organisation</type>
-  <workflow>validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Organisation Module</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Person</type>
-  <workflow>validation_workflow, edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Person Module</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Predicate</type>
-  <workflow>rule_interaction_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Preference</type>
-  <workflow>preference_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Preference Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Route Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Rule Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Simulation Movement</type>
-  <workflow>simulation_movement_interaction_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Simulation Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Telephone</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Template Tool</type>
-  <workflow></workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Trash Bin</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Trash Folder</type>
-  <workflow>(Default)</workflow>
- </chain>
- <chain>
-  <type>portal_type_workflow_chain/Trash Tool</type>
-  <workflow>(Default)</workflow>
- </chain>
-</workflow_chain>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
new file mode 100755
index 0000000000000000000000000000000000000000..ed83ee942cc35b6c5f5bd09db3d4576cf52c13a2
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -0,0 +1,166 @@
+<workflow_chain>
+ <chain>
+  <type>Address</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Agent</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Agent Privilege</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Alarm</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Alarm Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Assignment</type>
+  <workflow>edit_workflow, assignment_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Bank Account</type>
+  <workflow>bank_account_workflow, edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Base Category</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Career</type>
+  <workflow>career_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Category</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Category Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>ChatAddress</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Credit Card</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Currency</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Currency Exchange Line</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Delivery Builder</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Delivery Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Document</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Email</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Favorite</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Fax</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>File</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Image</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Link</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Mapped Value</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>News Item</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Order Builder</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Order Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Organisation</type>
+  <workflow>edit_workflow, validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Person</type>
+  <workflow>edit_workflow, validation_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Predicate</type>
+  <workflow>rule_interaction_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Preference</type>
+  <workflow>preference_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Preference Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Route Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Rule Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Simulation Movement</type>
+  <workflow>simulation_movement_interaction_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Simulation Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Telephone</type>
+  <workflow>edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Trash Bin</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Trash Folder</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Trash Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
+</workflow_chain>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
index 2180367f9cd792c0b822e83e16c0ffe9ab28bb6a..817e31aec85229d19fcd821df5fdf12e03b522e3 100755
--- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
@@ -1,47 +1,51 @@
-Address
-Agent
-Agent Privilege
-Alarm
-Alarm Tool
-Applied Rule
-Assignment
-Bank Account
-Base Category
-Career
-Category
-Category Tool
-ChatAddress
-Credit Card
-Currency
-Currency Exchange Line
-Currency Module
-Delivery Builder
-Delivery Tool
-Document
-Email
-Favorite
-Fax
-File
-Folder
-Image
-Link
-Mapped Value
-News Item
-Order Builder
-Order Tool
-Organisation
-Organisation Module
-Person
-Person Module
-Predicate
-Preference
-Preference Tool
-Route Tool
-Rule Tool
-Simulation Movement
-Simulation Tool
-Telephone
-Template Tool
-Trash Bin
-Trash Folder
-Trash Tool
\ No newline at end of file
+Address | edit_workflow
+Agent Privilege | (Default)
+Agent | edit_workflow
+Alarm Tool | (Default)
+Alarm | (Default)
+Applied Rule |
+Assignment | assignment_workflow
+Assignment | edit_workflow
+Bank Account | bank_account_workflow
+Bank Account | edit_workflow
+Base Category | (Default)
+Career | career_workflow
+Category Tool | (Default)
+Category | edit_workflow
+ChatAddress | edit_workflow
+Credit Card | edit_workflow
+Currency Exchange Line | edit_workflow
+Currency Module |
+Currency | edit_workflow
+Delivery Builder | (Default)
+Delivery Tool | (Default)
+Document | edit_workflow
+Email | edit_workflow
+Favorite | edit_workflow
+Fax | edit_workflow
+File | edit_workflow
+Folder |
+Image | edit_workflow
+Link | edit_workflow
+Mapped Value | edit_workflow
+News Item | edit_workflow
+Order Builder | (Default)
+Order Tool | (Default)
+Organisation Module |
+Organisation | edit_workflow
+Organisation | validation_workflow
+Person Module |
+Person | edit_workflow
+Person | validation_workflow
+Predicate | rule_interaction_workflow
+Preference Tool | (Default)
+Preference | preference_workflow
+Route Tool | (Default)
+Rule Tool | (Default)
+Simulation Movement | simulation_movement_interaction_workflow
+Simulation Tool | (Default)
+Telephone | edit_workflow
+Template Tool |
+Trash Bin | (Default)
+Trash Folder | (Default)
+Trash Tool | (Default)
\ No newline at end of file