diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/build_amortisation.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/build_amortisation.xml
index f8bc2eab14d4a9981513eb8116d07c9c7e89938b..c0673d1fd15dcf0c702f984aa67e1fd1fc3dfbdc 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/build_amortisation.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/build_amortisation.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml
index d2744141beee373d6a0cc230c76fd44d1d53200f..02f19ed94b949a6adda52c2cacc1614e9dc147c0 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml
index 6b4c60be35854c27ba55ebdb2712c707d59a1ac0..0046e22ab569e0e427739594777b8e4c080b4594 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml
index 882a1b10d3770e2a80c36fe37946e5347cb92bf6..e8e5677d22f57558bc49d6a6a752c5414e58495a 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml
index 489ec9af7d555d54484fe89b622e783e6d608a5c..7b06be8a65da078640854ebdaf049bdfd5c0c841 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml
index fc911ca72e6e8ef07ae45021e1d4a0fb4dfcff8e..def2b761d5e59ff905ffb52cdd63271321bc5d73 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
index b293b729c247dd8265299163106858d77029175a..a08f74340bc6cd8d3b2a22fd616ea6b18d3ea05b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
index d2744141beee373d6a0cc230c76fd44d1d53200f..02f19ed94b949a6adda52c2cacc1614e9dc147c0 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/jump_causality_items.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/jump_causality_items.xml
index e567081e77229a90c35751cab42e241571dd451b..b328adf43656fdef7e10479ad3c319c7164456a1 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/jump_causality_items.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/jump_causality_items.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
index 7f7ebc00e24456b1a346663170359709494a82cd..203723c7c1b3d614244df22b7dc3804e7b7b2a7f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
index dc93034f8b25d944a8546ce62eb9700656882bce..53644cdbe3fcfa8a72fb6134893ef157c2131f81 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
index dfeeca502f50a77f059e2d1ef0b493caae9f34e9..aec0d852d658f273e11ab4867b9ea7aebdf19266 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Delivery%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
index 089782cbc27aa35425db9e8aebafecfea70f0cf3..ee2038fea2860a2cf49ad26aa853d936bd8ff8bd 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
index 799ec8652d4dc4ee86cf5b6146d202d99b58f97c..b9b9087faf09033846349b8ecc8c7c5e4b4c6729 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
index 48baa2f536bf225d72cb5baec809a901987978b2..ce520bf3c23ac355d17a5540007a31634c247e87 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
index 602dbf128bf98ceda545bf4d5a4f7ec3c172388c..fcf63bce405284a9b5ce0611c91d030932374f00 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml
index cb200e2d270a12ade4481ed8444a8af535284df4..7d1b6e3e16ddffa4314535891d321cba92fbdd57 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml
index 79d159a502987a931f06e8396703ef586537cd78..700146dcef67462285d2f64f3cfcc42cc274bffa 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
index ba135248bd54e6e3d1baba9583233c14e58663cd..aa4462196a4683ca44115f359c15937a81336eba 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
index 089782cbc27aa35425db9e8aebafecfea70f0cf3..ee2038fea2860a2cf49ad26aa853d936bd8ff8bd 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml
index 03ffd53572e0ba0af9211a274e00a0612e63ab61..49590cdc31d088aa0051acfe2efe0a606138172f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
index 799ec8652d4dc4ee86cf5b6146d202d99b58f97c..b9b9087faf09033846349b8ecc8c7c5e4b4c6729 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
index 3219b8969702f10c3cdd6e79e4bbfa228809c5f1..c26957842cc3216fbf4a1271fd4d94c233a66258 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
index fd640bbfcce2626353a3c0ade69a17f864b9d0b1..be0a4d57d680789a7d6a15a9a2b6b676b08051e3 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List/immobilisation_validity_errors.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List/immobilisation_validity_errors.xml
index 03ffd53572e0ba0af9211a274e00a0612e63ab61..49590cdc31d088aa0051acfe2efe0a606138172f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Internal%20Packing%20List/immobilisation_validity_errors.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml
index 03ffd53572e0ba0af9211a274e00a0612e63ab61..49590cdc31d088aa0051acfe2efe0a606138172f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List/immobilisation_validity_errors.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List/immobilisation_validity_errors.xml
index 03ffd53572e0ba0af9211a274e00a0612e63ab61..49590cdc31d088aa0051acfe2efe0a606138172f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Purchase%20Packing%20List/immobilisation_validity_errors.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
index f4c82ac3f59bafe830eb18be1a58a68b74087ab6..05bfa5d4cf7fc6814bc8a47af55e9b2202ac056b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_linear_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
index 5cf65e78120887acd1c7c5553e8b945a589ac71d..5e5cc58c3767ac65a42acb06f31b0c2763815b82 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/eu_no_amortisation_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
index f255b34f49bf256002e2b526dfddeb7f73d9c2f1..0efafccf619ab676b8fe838117834a5804d1688e 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_actual_use_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
index cd2b0a6c1cd98a82537b180167d2981713178007..101381d5458c0755c86c3a2a54a9894fb1c4911b 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
index 76ab36de56693bdf6a9d57eb035bc0452dc073e5..177820ebcca2fe231a53e705b93ad217cb08a3a6 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/fr_uncontinuous_degressive_amortisation_method_view_details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List/immobilisation_validity_errors.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List/immobilisation_validity_errors.xml
index 03ffd53572e0ba0af9211a274e00a0612e63ab61..49590cdc31d088aa0051acfe2efe0a606138172f 100755
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Sale%20Packing%20List/immobilisation_validity_errors.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_aggregate.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_aggregate.xml
index 4487f64747d0c6de35917e445cabef3a6264e99f..2e6cd778d76ceffb95de4722bc5ad580a1eddefe 100755
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_aggregate.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_aggregate.xml
@@ -51,8 +51,8 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>table_0</string>
-<string>table_1</string>
+                            <string>table_0</string>
+                            <string>table_1</string>
                           </list>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
index 18ec2630cb18c2840ef7e47d184f7c51157cdfd7..6736e906407026d65f9c2b3929be0d0f10660851 100755
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
@@ -105,7 +105,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>extra_cost_account</string> </value>
+            <value> <string>extra_cost_account</string> </value>
         </item>
         <item>
             <key> <string>id_group</string> </key>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
index 809e492b3035207ec83551293c02757bcffa6927..9f652753fd56fd46cdf3e6dd375adb8fc3840520 100755
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
@@ -106,7 +106,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>immobilisation_vat_account</string> </value>
+            <value> <string>immobilisation_vat_account</string> </value>
         </item>
         <item>
             <key> <string>id_group</string> </key>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
index f1c7d7dc6fb2f5831933076e39fd5d9b27582789..725767b5480c986ff4c35faeb5f94b0edb08b3a7 100755
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
@@ -105,7 +105,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>monthly_amortisation_account</string> </value>
+            <value> <string>monthly_amortisation_account</string> </value>
         </item>
         <item>
             <key> <string>id_group</string> </key>
diff --git a/bt5/erp5_immobilisation/LocalRolesTemplateItem/.xml b/bt5/erp5_immobilisation/LocalRolesTemplateItem/.xml
new file mode 100755
index 0000000000000000000000000000000000000000..6ead7bdf621b0613d1fae86195dd06150bf09927
--- /dev/null
+++ b/bt5/erp5_immobilisation/LocalRolesTemplateItem/.xml
@@ -0,0 +1,9 @@
+<local_roles_item>
+ <local_roles>
+  <role id='admin'>
+   <item>Owner</item>
+  </role>
+ </local_roles>
+ <group_local_roles>
+ </group_local_roles>
+</local_roles_item>
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
index 60770d3ca52b48cc3f091cf0e3fb1ab0f4c38558..1cb0725d7cb5222f581cab313cb99884d4f6f12c 100755
--- a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
+++ b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
@@ -19,9 +19,6 @@
   <permission>
    <name>Access session data</name>
   </permission>
-  <permission>
-   <name>AccessContentsInformation</name>
-  </permission>
   <permission>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
diff --git a/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml b/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
new file mode 100755
index 0000000000000000000000000000000000000000..600ebe860dd0f884a53c0e7a8e5bb4f3e5abf22f
--- /dev/null
+++ b/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
@@ -0,0 +1,2 @@
+<type_roles>
+</type_roles>
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
index 08edc7b8f21c3a941254fbe9f4a75685e4d0f346..33c8a5927d4f499ba89098ba3058eff0d787d478 100755
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>  </string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
index 5563f3d96b19cdef3d195828c88b7ef1b1efb04e..0d69e5e217575668f3a3fcf24ee991bc81031d5b 100755
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
@@ -62,7 +62,7 @@ an accounting immobilisation (in order to amortise an object)\n
 It is an instant movement without source or destination, but which\n
 implies a state change and a source_decision and a destination_decision\n
 Do not index in stock table\n
-  </string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>factory</string> </key>
diff --git a/bt5/erp5_immobilisation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_immobilisation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index cfdf59933bb94e1612260cd237b049fd8213f682..a082218fd82d086b39aa2bf0b0fde7d01d8548b2 100755
--- a/bt5/erp5_immobilisation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_immobilisation/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -5,12 +5,20 @@
  </chain>
  <chain>
   <type>Amortisation Transaction Line</type>
-  <workflow>amortisation_transaction_interaction_workflow, edit_workflow</workflow>
+  <workflow>edit_workflow, amortisation_transaction_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Delivery Cell</type>
   <workflow>immobilisation_movement_interaction_workflow</workflow>
  </chain>
+ <chain>
+  <type>Immobilisation</type>
+  <workflow>immobilisation_delivery_workflow, immobilisation_workflow, immobilisation_movement_interaction_workflow, edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Immobilisation Line</type>
+  <workflow>edit_workflow, immobilisation_movement_interaction_workflow</workflow>
+ </chain>
  <chain>
   <type>Internal Packing List</type>
   <workflow>immobilisation_workflow, immobilisation_movement_interaction_workflow</workflow>
@@ -45,7 +53,7 @@
  </chain>
  <chain>
   <type>Sale Packing List</type>
-  <workflow>immobilisation_workflow, immobilisation_movement_interaction_workflow</workflow>
+  <workflow>immobilisation_movement_interaction_workflow, immobilisation_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Packing List Cell</type>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod.xml
index 5d0bf46d78d971f1d6f6f938712d61fd00ca95a6..83eb0091b38fe25b03d1a5dc7fc66612a984b592 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod.xml
index 06e57363792253737f544f252c4a175b4ef18db1..7ab79199bfd0dc158b4f9c7cf9f9dc2ea64a79e4 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear/ratioCalculation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear/ratioCalculation.xml
index b9f414cf714fbaef86438afbe92cb05eaff22f21..c2f4787a9b5dbe5d038a0e89bc4c8fbe4d371448 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear/ratioCalculation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear/ratioCalculation.xml
@@ -79,7 +79,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_eu/linear/ratioCalculation</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/linear/ratioCalculation</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation.xml
index a7427a6c6a21b70cdc275d677d21f60a05cbd54b..9bf244e0ff4ab4accfd80ab3503f4e5cd0a98c14 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation.xml
@@ -79,7 +79,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_eu/linear/ratioCalculation</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod.xml
index df7eda264fb1cff524457c1d8da769025686142b..f6f04e1bbbd292040ba3cd7a7282e09f4c2d03fb 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod.xml
index db1be26054549deb9cdd7f288669bbee0d7e6d89..c093578729cb2bc20efd9818d0c00a78d7ab963d 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod.xml
index 0253613f24d34e87828701e78f086df392e13405..5c752ecd8fc05c80ece11bd06dee67aa51ef99e9 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation.xml
index 751b9ad9b8281b607e76ee6e8b4682bff0af4235..b1545b9e23505cd813413f5aa49927432453fd62 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation.xml
@@ -94,7 +94,7 @@ except ZeroDivisionError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive/ratioCalculation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive/ratioCalculation.xml
index 914698c2109d540395d4b2f0162104430331e456..d9340583352e034399c708a6623ac65409658ba1 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive/ratioCalculation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive/ratioCalculation.xml
@@ -103,7 +103,7 @@ except IndexError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/degressive/ratioCalculation</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/degressive/ratioCalculation</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation.xml
index ba8c09c01263bb837dfd30c41d530acfd2421982..757c6f3649a60f6ac4a732bc401d27339236dc45 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation.xml
@@ -103,7 +103,7 @@ except IndexError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_accounting_fr/degressive/ratioCalculation</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml
index cdfcf6d7c0446058c30064a1bc34007b005d6c03..08dc8621a655a4278ce9bce17dd30975f3b2dd19 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml
@@ -89,7 +89,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml
index bb58303191e267e2cff3736f5e00d4ffc2a46b61..6646010e5f892091f0b67f7d8348b6a1c38ffa6c 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml
@@ -101,7 +101,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml
index d17ba59a8b418d0b18aea778987b2da07cd17bc6..a5910ee0fc27b6c8bd530dedc85ed47b1b99f2fd 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml
@@ -102,7 +102,7 @@ context.portal_deliveries.amortisation_transaction_builder.build(**builder_kw)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
index e02ec56699be972ba38cb87938162be1ace0bb71..09db4f14c2346df754399b15b21700d12b0a7640 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
@@ -73,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
index 793d3da71d08c7fd99a56681e4b584ec1cbfb207..56f60a6e0fcc01d698adf9800f8e7071b432cd10 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
@@ -73,7 +73,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
index 3b800442845613fa30e5169a883f38a5dac8f0b2..2d2019e2e217a7bfd9de87f4ed67c9d3d1727da6 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
@@ -133,7 +133,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml
index f6beec40f97baedd30e4d8a1566b7084255783bd..1612e44a6e32026bea76d009d2b53c047bee7604 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -110,7 +110,7 @@
                             <string>kw</string>
                             <string>_apply_</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml
index 4b492042a6595acb3ba6c389cecb1371b6e807f6..fbb3c2516e9a9037b2adaf3b97d9e6e5307b4187 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml
@@ -110,7 +110,7 @@ context.activate(after_tag=\'after_amortisation_build\').updateCausalityState()\
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml
index 97a3c28f85f84470336b8ffc724ee4e02dddad15..35093d145ca6ea7aac20fce98985d86084aa4fa0 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml
@@ -100,7 +100,7 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml
index e5e7b0d6638e526934b97c87d5ae919a296ce261..2bf210e0fcff8ca10d2c3fe1738668caa8d93cdd 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml
@@ -83,7 +83,7 @@ return return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml
index af6ecf5cd6c41744cbac18935a44a728a21164da..cce41c6a7a082169547dcaa172ef0e37a3c8162e 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml
@@ -79,7 +79,7 @@ return filter(lambda x: len(x.getDeliveryValueList())==0, movement_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml
index b25fbf6be4f6c773c21a0df4927a722d6aa08875..751ded9e5b3408e0ab217385defda44c02d4a203 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml
@@ -98,7 +98,7 @@ return price\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
index ca0f7bb48ea98aea3c9d3f3e601c84ada3214848..5d90c0ffb35b3091eec2aa9ef72ab6a5d9a76d95 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
@@ -83,7 +83,7 @@ for item in item_list:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
index ef47e32cd9358d7da59d5836cb019edab7bb28e8..ae1d095cc9e914a45005ccfe1eb6684cbddb8156 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
@@ -136,7 +136,9 @@
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>external_validator</string> </key>
@@ -156,9 +158,7 @@
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>items</string> </key>
@@ -283,7 +283,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:portal.restrictedTraverse(\'immobilisation_module\', None) is None</string> </value>
+            <value> <string>python:here.restrictedTraverse(\'immobilisation_module\', None) is not None</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml
index d180daa47d8af7126c7b475a3ec68d4df3d0b350..77a5561455b38f6e2e19af7dc8ef155ab94f5be6 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml
@@ -98,7 +98,7 @@ return [(\'\',\'\')] + getList()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_getAccounts</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAccounts</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml
index 7497cdc7af7b4586c82ea94fa00742f3a7199878..4522325c12aa9a34cbe64fab0ee6717484793a07 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml
@@ -85,7 +85,7 @@ return [(\'\',\'\')] + return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml
index f259e378b3cc46a1e1ba05bbcd88a66c53e469f0..e95b998fd58fd1b403a7613f064886e02f8034ac 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml
@@ -93,7 +93,7 @@ return return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml
index b4dd30e0e6a7f53faf57fffcf235d5c403c9237c..8a38c4b2386a910bd1e52c1bfe26876964320393 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml
@@ -127,7 +127,7 @@ return returned_value\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml
index 7102bd0ce44c8f3f55d0a2b385bbb6848d7bb4c0..706c486fa57945653ce5e5a74e1043e98c748334 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml
@@ -69,14 +69,28 @@
             <value> <string># Return a list of translated strings corresponding to errors for this movement validity\n
 translate = context.Base_translateString\n
 \n
-error_list = context.checkImmobilisationConsistency()\n
+def translateString(msg):\n
+  try:\n
+    msg = msg.get(\'msg\')\n
+    mapping = msg.get(\'mapping\')\n
+  except AttributeError:\n
+    mapping = None\n
+  if translate is None:\n
+    return msg\n
+  translate_kw = {\'catalog\':\'content\'}\n
+  if mapping is not None:\n
+    translate_kw[\'mapping\'] = mapping\n
+  return translate(msg, **translate_kw)\n
+\n
+\n
+error_list = context.checkImmobilisationConsistency(to_translate=1)\n
 if len(error_list) == 0:\n
   return [translate(\'Valid\', \'content\')]\n
 \n
 translated_list = []\n
 for error in error_list:\n
   object = context.getPortalObject().restrictedTraverse(error[0])\n
-  string = translate(error[3], \'content\')\n
+  string = translateString(error[3])\n
   object_title = object.getTitle() or object.getId()\n
   translated_list.append(\'%s : %s\' % (object_title, string))\n
 return translated_list\n
@@ -90,7 +104,7 @@ return translated_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -124,6 +138,7 @@ return translated_list\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>translate</string>
+                            <string>translateString</string>
                             <string>error_list</string>
                             <string>len</string>
                             <string>translated_list</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml
index b2a8be652d33c6adfae08f72cbfd0f57e86ae5a5..5c7052517df3aa07d42da05f42fc83ca9b3ea16f 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml
@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_isInvalid</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_isInvalid</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +108,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml
index 1908c648db410d4432804134b2bb449d8ea0393f..17117bfa2762ccd40b97e33534e94a29511bc280 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml
@@ -81,7 +81,7 @@ return 1\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -113,7 +113,7 @@ return 1\n
                           <tuple>
                             <string>kw</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>method</string>
                             <string>None</string>
                           </tuple>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml
index 13e3eeb4da2043e5466a341005a5ef63e98faf22..1ec24e3bd0a7e0a3259c58c6415ee874a2eb08bb 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml
@@ -146,7 +146,9 @@
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>external_validator</string> </key>
@@ -158,9 +160,7 @@
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>max_length</string> </key>
@@ -247,7 +247,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Validity State</string> </value>
+                    <value> <string>Immobilisation State</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
@@ -300,7 +300,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:portal.restrictedTraverse(\'immobilisation_module\', None) is None</string> </value>
+            <value> <string>python:here.restrictedTraverse(\'immobilisation_module\', None) is not None</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml
index af3e19bce773d99f5b7968549355b26010c3eeb7..564b877e2e034d5f3fb4807c9f8be120ae04349d 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml
@@ -66,21 +66,19 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>#from Document.ImmobilisableItem import ImmobilisationCalculationError\n
-#from Document.ImmobilisableItem import ImmobilisationValidityError\n
+            <value> <string>from Products.ERP5Type.Errors import ImmobilisationCalculationError, ImmobilisationValidityError\n
 \n
-# XXX TODO : handle errors\n
 immo_period_list = []\n
 error = \'\'\n
-#try:\n
-immo_period_list = context.getImmobilisationPeriodList()\n
-#except ImmobilisationCalculationError:\n
-#  error = \'A calculation error occured\'\n
-#except ImmobilisationValidityError:\n
-#  error = \'A movement validity error occured\'\n
+try:\n
+  immo_period_list = context.getImmobilisationPeriodList()\n
+except ImmobilisationCalculationError:\n
+  error = \'A calculation error occured\'\n
+except ImmobilisationValidityError:\n
+  error = \'A movement validity error occured\'\n
   \n
 if return_errors:\n
-  return error\n
+  return context.Base_translateString(error)\n
 \n
 immo_object_list = []\n
 for immo_period in immo_period_list:\n
@@ -96,7 +94,7 @@ return immo_object_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -136,6 +134,9 @@ return immo_object_list\n
                           <tuple>
                             <string>return_errors</string>
                             <string>kw</string>
+                            <string>Products.ERP5Type.Errors</string>
+                            <string>ImmobilisationCalculationError</string>
+                            <string>ImmobilisationValidityError</string>
                             <string>immo_period_list</string>
                             <string>error</string>
                             <string>_getattr_</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml
index dc34e6f112c50b198edbaf95f4e15a8422335948..9fc7578c14c778abfd9cd84408e7cd6a5a4167cc 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml
@@ -98,7 +98,7 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
index f77e949d23f14fdb9f48c5bf4fd37334ac5483f9..44e09836e5bcb0de450ed902fc11ce5a1983d6a6 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
@@ -279,7 +279,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.Immobilisation_getAmortisationMethodDisplayList(return_errors=1)</string> </value>
+            <value> <string>python: here.Item_getImmobilisationPeriodAsObjectList(return_errors=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions.xml
index dc6a4239da4caf06e9c46d131eddab115c9edf69..5f37dbc9ef13ed158b7b7ca31a382aaf2c89c922 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions.xml
@@ -103,7 +103,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions.xml
index 60648be1cecdc8de5d1afb9802200b4d72f972b3..a9e9f1b896e9a903f0206d514c7494b7eed013b3 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions.xml
@@ -120,7 +120,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions.xml
index 349aa6f7154f5ebbbe3b8e4efed25ee76aca57e3..0bc91b955db08366bed92f474b0f9cdac510593f 100755
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions.xml
@@ -111,7 +111,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision.xml
index aa48cc89a41751c6a537a99d64c1584666b8445a..832c6bbff477257634c182f46be068911bd34e2b 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision.xml
@@ -94,7 +94,7 @@ transaction.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml
index 97fd527a9013a1a2cd78c9b57e745be0251d88fe..831df11768e1d405dfa9bcad1f0efcea184138f5 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision.xml
@@ -98,7 +98,7 @@ transaction.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit.xml
index ec9c0f8dc43f2ab4c33af006437e0ff1a9b8f4c2..9ae7f6072203e62e246938308a157e6636069c29 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit.xml
@@ -78,7 +78,7 @@ context.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision.xml
index 42454d2d84864526722fb38685588fd011b61b93..c38930517515400b95c2f97d8a036c2ec2939262 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision.xml
@@ -96,7 +96,7 @@ packing_list.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision.xml
index b48c6d798058a0bef9c91cc2916a13c560f97038..9c7238fc2d5cfa58f622372583d14d6e6133557c 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision.xml
@@ -102,7 +102,7 @@ packing_list.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit.xml
index 225eded7b1c9f7989b083e7f0380d849e1e62792..3bd9f4c16a3038d71c8bc95409b8c0f279f0b21c 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit.xml
@@ -79,7 +79,7 @@ if context.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit.xml
index 5de206056c613387fd7d213c736d2a4b68c3c23a..70e98612ddb334b7d496aa9fb61f3fbf7ba958bd 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit.xml
@@ -79,7 +79,7 @@ object.getRootDeliveryValue().edit()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
index bccdbc2c5c794ebf33daf607903b5b04907ec82d..e62917bfcd9e3c24e8f3fae10d0978973124e9e8 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement.xml
@@ -85,7 +85,7 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd.xml
index 70821d47e3b5c70253e8edbb504862bb49d2970e..8fd8fbe14cffccae5ec0c55fa90a6ff813733dab 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd.xml
@@ -78,7 +78,7 @@ transaction.log(\'after add on transaction\',transaction)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
index ab59e899672adc6902873cc0e5b50a75fe37de46..b3a4768bec3bf826311f385a60e63f04a3fcfabc 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement.xml
@@ -86,7 +86,7 @@ for line in delivery.getMovementList():\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
new file mode 100755
index 0000000000000000000000000000000000000000..069c493b912b89d27d24bd3eeb1d8320bb821302
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.DCWorkflow</string>
+          <string>DCWorkflowDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>immobilisation_delivery_workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>initial_state</string> </key>
+            <value> <string>delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>state_var</string> </key>
+            <value> <string>simulation_state</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Immobilisation Delivery Workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml
new file mode 100755
index 0000000000000000000000000000000000000000..091664a6e29252d143526836c25f49168b582cd4
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Scripts</string>
+          <string>Scripts</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mapping</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>scripts</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>order_workflow</string> </key>
+                    <value>
+                      <tuple>
+                        <dictionary>
+                          <item>
+                              <key> <string>order_action</string> </key>
+                              <value> <string>order</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>order_actor</string> </key>
+                              <value> <string>superseb</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>order_comment</string> </key>
+                              <value> <string></string> </value>
+                          </item>
+                          <item>
+                              <key> <string>order_state</string> </key>
+                              <value> <string>ordered</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>order_time</string> </key>
+                              <value>
+                                <object>
+                                  <klass>
+                                    <global name="DateTime" module="DateTime.DateTime"/>
+                                  </klass>
+                                  <tuple>
+                                    <none/>
+                                  </tuple>
+                                  <state>
+                                    <dictionary>
+                                      <item>
+                                          <key> <string>_aday</string> </key>
+                                          <value> <string>Mon</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_amon</string> </key>
+                                          <value> <string>Jul</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_d</string> </key>
+                                          <value> <float>37463.758549</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_day</string> </key>
+                                          <value> <int>28</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_dayoffset</string> </key>
+                                          <value> <int>1</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_fday</string> </key>
+                                          <value> <string>Monday</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_fmon</string> </key>
+                                          <value> <string>July</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_hour</string> </key>
+                                          <value> <int>20</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_millis</string> </key>
+                                          <value> <long>1059415938634</long> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_minute</string> </key>
+                                          <value> <int>12</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_month</string> </key>
+                                          <value> <int>7</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_nearsec</string> </key>
+                                          <value> <float>18.0</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pday</string> </key>
+                                          <value> <string>Mon.</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pm</string> </key>
+                                          <value> <string>pm</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pmhour</string> </key>
+                                          <value> <int>8</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pmon</string> </key>
+                                          <value> <string>July</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_second</string> </key>
+                                          <value> <float>18.634</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_t</string> </key>
+                                          <value> <float>1059415938.63</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_tz</string> </key>
+                                          <value> <string>GMT+2</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_year</string> </key>
+                                          <value> <int>2003</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>time</string> </key>
+                                          <value> <float>0.758549004626</float> </value>
+                                      </item>
+                                    </dictionary>
+                                  </state>
+                                </object>
+                              </value>
+                          </item>
+                        </dictionary>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
new file mode 100755
index 0000000000000000000000000000000000000000..9653d814da20a701a5e9f1a05754d33743dab98c
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>States</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mapping</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>states</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
new file mode 100755
index 0000000000000000000000000000000000000000..ddba2b4e030bb1975567aaf55d99979963ceccd2
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.States</string>
+          <string>StateDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Delivered</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Add portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
new file mode 100755
index 0000000000000000000000000000000000000000..eec7ba7928f9db635db75d2d90bdbeeed6e5be55
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Transitions</string>
+          <string>Transitions</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mapping</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>transitions</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
new file mode 100755
index 0000000000000000000000000000000000000000..d36f9e73c8fa005ab1ca08bbee170225e2e30065
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>Variables</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mapping</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>variables</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
new file mode 100755
index 0000000000000000000000000000000000000000..e2d54b25d769b04e37fad3417d218ec035470e50
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>action</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>transition/getId|nothing</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
new file mode 100755
index 0000000000000000000000000000000000000000..b81346a188e9d410bdc524bf29d71c14b6e862de
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>actor</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>user/getUserName</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
new file mode 100755
index 0000000000000000000000000000000000000000..05ac72139e772a6566353292fdf25ffd7870648f
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>comment</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>python:state_change.kwargs.get(\'comment\',\'\')</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
new file mode 100755
index 0000000000000000000000000000000000000000..2a212275cf48864d8ac38320bcbe37629c8b1ff3
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>history</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>state_change/getHistory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
new file mode 100755
index 0000000000000000000000000000000000000000..aaacee8edcd299fe6ab0bd3dd34716495d200659
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>portal_type</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
new file mode 100755
index 0000000000000000000000000000000000000000..eefa0e2162aa025a3ebc43650c3ba3b9ccda2752
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>start_date</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>python:state_change.kwargs.get(\'start_date\',state_change.object.getStartDate())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
new file mode 100755
index 0000000000000000000000000000000000000000..23960e36b77dc0d33def769cc398778b9b1ee7e0
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>stop_date</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>python:state_change.kwargs.get(\'stop_date\',state_change.object.getStopDate())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
new file mode 100755
index 0000000000000000000000000000000000000000..a3891299981e44f43071c0030f1069bcaa2edf33
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>time</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>state_change/getDateTime</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml
new file mode 100755
index 0000000000000000000000000000000000000000..055366cf24001b4dc67bce9e07d59b30ed034f02
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Worklists</string>
+          <string>Worklists</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mapping</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>worklists</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState.xml
index 8af2a9fa3b6a3e422bc48d6ff047614434c1b874..6d22b948fe68612c2d931c8e9a7f032b00c8f0d3 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState.xml
@@ -86,7 +86,7 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
index ec4542610a90b89ed6ef46a9876dbebf3f008bb6..8e74c5ecdf3119f36ba4cc1ceff2c94e75e9d2e7 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
@@ -85,7 +85,7 @@ context.ImmobilisationDelivery_expandAggregatedItems()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState.xml
index deb2c8f7243576c0ab57af347b19866252be31ce..5992f0a7adab2231a45f4b45d2ac1c9c2d98df47 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState.xml
@@ -85,7 +85,7 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
index 1b543e834510f4508ea2eb7bafaeea0c325f3bd9..b5c39dbe8f3ac4f90679a2e2bf5eb2270d845d8a 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
@@ -104,7 +104,7 @@ for simulation_movement in simulation_movement_list:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
index 2f139b825dbfc6b30f65f4b6c2e1c56e6dd2e404..19bfd50a6e79a0eeb59c459701cc1cbbb2beb9ac 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
@@ -87,7 +87,7 @@ if packing_list_content.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
index 69804b63e3ff82c6549d0f310d7bde72dd867c21..7705ac2db58c7be3b74d7a1505febb4394f5c0da 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -87,7 +87,7 @@ if packing_list.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit.xml
index b5ad94d19881f4f724563621d196a1d2252d1227..739a3586af21ba022395671c7f2fa0ed6ff72bb5 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit.xml
@@ -91,7 +91,7 @@ context.activate(\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/copy_of_preference_workflow/scripts/ImmobilisationMovement_afterEdit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit.xml
index e829c623d24fb8b9f9b914bef9a34e5ec7267dbe..9074fd6c5ea7072a9a3a54635c3ad80883be7d52 100755
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit.xml
@@ -81,7 +81,7 @@ context.ImmobilisationDelivery_expandAggregatedItems()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5_bceao/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/bt/change_log b/bt5/erp5_immobilisation/bt/change_log
index c4c5379a7b5231a3c5fe3a1f519c1c67eda1281e..d826ac80b3273e8b99ffaa159157ae32ecc17bb4 100755
--- a/bt5/erp5_immobilisation/bt/change_log
+++ b/bt5/erp5_immobilisation/bt/change_log
@@ -1,3 +1,10 @@
+2006-03-09 Guillaume
+* Removed result table item
+* Handle errors in Item_viewImmobilisationPeriods
+* Translate immobilisation validity errors
+* Forgot some workflow chains on Immobilisation and Immobilisation Line
+* Added immobilisation_delivery_workflow
+
 2006-03-02 Guillaume
 * Added immobilisation skins to Delivery Cell
 
diff --git a/bt5/erp5_immobilisation/bt/description b/bt5/erp5_immobilisation/bt/description
index 6c94664afab1bda070aec649967a8e39ab7565f6..28559a2e83ff5bcfe3ca0a152de9528e3432d6b7 100755
--- a/bt5/erp5_immobilisation/bt/description
+++ b/bt5/erp5_immobilisation/bt/description
@@ -15,11 +15,4 @@ After installing this BT, you should achieve some tasks :
 
 
 TODO : 
-- Handle exceptions in Item_viewImmobilisationPeriods
-- Handle currency changes in expand
-
-
-Notes : 
-- 'item' result table should be in erp5_core
-
-- z_catalog_object_list, z_create_catalog and Resource_zGetTrackingList need to be updated
\ No newline at end of file
+- Handle currency changes in expand
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/bt/template_catalog_result_table_list b/bt5/erp5_immobilisation/bt/template_catalog_result_table_list
index a713074253483fbf0d6e4a40d92b6568dc9fa57c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100755
--- a/bt5/erp5_immobilisation/bt/template_catalog_result_table_list
+++ b/bt5/erp5_immobilisation/bt/template_catalog_result_table_list
@@ -1 +0,0 @@
-item
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/bt/template_portal_type_workflow_chain_list b/bt5/erp5_immobilisation/bt/template_portal_type_workflow_chain_list
index 8896b5340c44bec4ff1a9c00874117ded7021b72..3c6e40aef261278f7e5909d6c084569d32463801 100755
--- a/bt5/erp5_immobilisation/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_immobilisation/bt/template_portal_type_workflow_chain_list
@@ -5,6 +5,12 @@ Amortisation Transaction | amortisation_transaction_causality_workflow
 Amortisation Transaction | amortisation_transaction_interaction_workflow
 Amortisation Transaction | edit_workflow
 Delivery Cell | immobilisation_movement_interaction_workflow
+Immobilisation Line | edit_workflow
+Immobilisation Line | immobilisation_movement_interaction_workflow
+Immobilisation | edit_workflow
+Immobilisation | immobilisation_delivery_workflow
+Immobilisation | immobilisation_movement_interaction_workflow
+Immobilisation | immobilisation_workflow
 Internal Packing List Line | immobilisation_movement_interaction_workflow
 Internal Packing List | immobilisation_movement_interaction_workflow
 Internal Packing List | immobilisation_workflow
diff --git a/bt5/erp5_immobilisation/bt/template_workflow_id_list b/bt5/erp5_immobilisation/bt/template_workflow_id_list
index 188db866acd8a449ce19b504b4b9346fedd2a5f2..554c7eec2f67459e09f8a93834357495107d9825 100755
--- a/bt5/erp5_immobilisation/bt/template_workflow_id_list
+++ b/bt5/erp5_immobilisation/bt/template_workflow_id_list
@@ -1,4 +1,5 @@
 amortisation_transaction_causality_workflow
 amortisation_transaction_interaction_workflow
+immobilisation_delivery_workflow
 immobilisation_movement_interaction_workflow
 immobilisation_workflow
\ No newline at end of file