From 8da579d51caf17edaaf7ad76e3b481ae2659c680 Mon Sep 17 00:00:00 2001
From: Guillaume Michon <guillaume@nexedi.com>
Date: Thu, 9 Mar 2006 16:14:48 +0000
Subject: [PATCH] 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

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6062 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../build_amortisation.xml                    |   4 +-
 .../history.xml                               |   4 +-
 .../metadata.xml                              |   4 +-
 .../print.xml                                 |   4 +-
 .../view.xml                                  |   4 +-
 .../causality_report.xml                      |   4 +-
 .../Amortisation%20Transaction/details.xml    |   4 +-
 .../Amortisation%20Transaction/history.xml    |   4 +-
 .../jump_causality_items.xml                  |   4 +-
 .../Amortisation%20Transaction/metadata.xml   |   4 +-
 .../Amortisation%20Transaction/print.xml      |   4 +-
 .../Amortisation%20Transaction/view.xml       |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 .../Immobilisation%20Line/history.xml         |   4 +-
 .../Immobilisation%20Line/metadata.xml        |   4 +-
 .../Immobilisation%20Line/print.xml           |   4 +-
 .../Immobilisation%20Line/view.xml            |   4 +-
 .../Immobilisation%20Module/list_ui.xml       |   4 +-
 .../Immobilisation%20Module/print.xml         |   4 +-
 .../Immobilisation%20Module/sort_on.xml       |   4 +-
 .../Immobilisation%20Module/view.xml          |   4 +-
 .../portal_types/Immobilisation/history.xml   |   4 +-
 .../immobilisation_validity_errors.xml        |   4 +-
 .../portal_types/Immobilisation/metadata.xml  |   4 +-
 .../portal_types/Immobilisation/print.xml     |   4 +-
 .../portal_types/Immobilisation/view.xml      |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 .../immobilisation_validity_errors.xml        |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 .../immobilisation_validity_errors.xml        |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 .../immobilisation_validity_errors.xml        |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...inear_amortisation_method_view_details.xml |   4 +-
 ...ation_amortisation_method_view_details.xml |   4 +-
 ...l_use_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 ...ssive_amortisation_method_view_details.xml |   4 +-
 .../immobilisation_validity_errors.xml        |   4 +-
 .../erp5_mysql/z_related_aggregate.xml        |   4 +-
 .../portal_categories/extra_cost_account.xml  |   2 +-
 .../immobilisation_vat_account.xml            |   2 +-
 .../monthly_amortisation_account.xml          |   2 +-
 .../LocalRolesTemplateItem/.xml               |   9 +
 .../immobilisation_module.xml                 |   3 -
 .../PortalTypeRolesTemplateItem/.xml          |   2 +
 .../portal_types/Immobilisation%20Line.xml    |   2 +-
 .../portal_types/Immobilisation.xml           |   2 +-
 .../workflow_chain_type.xml                   |  12 +-
 ...tion_isUsingEuLinearAmortisationMethod.xml |   4 +-
 ...singEuNoAmortisationAmortisationMethod.xml |   4 +-
 .../linear/ratioCalculation.xml               |   2 +-
 .../no_amortisation/ratioCalculation.xml      |   2 +-
 ...n_isUsingFrActualUseAmortisationMethod.xml |   4 +-
 ..._isUsingFrDegressiveAmortisationMethod.xml |   4 +-
 ...continuousDegressiveAmortisationMethod.xml |   4 +-
 .../actual_use/ratioCalculation.xml           |   2 +-
 .../degressive/ratioCalculation.xml           |   2 +-
 .../ratioCalculation.xml                      |   2 +-
 ...e_activateBuildAmortisationTransaction.xml |   2 +-
 ...ildAmortisationTransactionDialogScript.xml |   2 +-
 ...ionModule_buildAmortisationTransaction.xml |   2 +-
 ...ule_buildAmortisationTransactionDialog.xml |   2 +-
 ...isationTransactionSelectItemListDialog.xml |   2 +-
 ...ortisationSystem_addAmortisationMethod.xml |   2 +-
 ...tisationTransaction_activateAfterBuild.xml |   4 +-
 .../AmortisationTransaction_afterBuild.xml    |   2 +-
 ...rtisationTransaction_jumpToRelatedItem.xml |   2 +-
 ...AmortisationTransaction_selectDelivery.xml |   2 +-
 ...AmortisationTransaction_selectMovement.xml |   2 +-
 .../Delivery_getTotalImmobilisedPrice.xml     |   2 +-
 ...lisationDelivery_expandAggregatedItems.xml |   2 +-
 .../my_amortisation_method.xml                |  10 +-
 .../Immobilisation_getAccounts.xml            |   2 +-
 ...ation_getAmortisationMethodDisplayList.xml |   2 +-
 ...mobilisation_getAmortisationMethodList.xml |   2 +-
 ...tion_getTransactionDeliveryRelatedInfo.xml |   2 +-
 ...isation_getValidityErrorTranslatedList.xml |  21 +-
 .../Immobilisation_isInvalid.xml              |   4 +-
 .../Immobilisation_showImmobilisationTab.xml  |   4 +-
 .../immobilisation_state.xml                  |  12 +-
 ...em_getImmobilisationPeriodAsObjectList.xml |  23 +-
 .../Item_jumpToAmortisationTransaction.xml    |   2 +-
 .../Item_viewImmobilisationPeriods/errors.xml |   2 +-
 ...ationDelivery_addImmobilisationActions.xml |   2 +-
 ...nMovement_addAmortisationMethodActions.xml |   2 +-
 ...rtalType_Item_addImmobilisationActions.xml |   2 +-
 ...AmortisationTransaction_acceptDecision.xml |   2 +-
 ...AmortisationTransaction_adoptPrevision.xml |   2 +-
 .../AmortisationTransaction_afterEdit.xml     |   2 +-
 .../scripts/PackingList_acceptDecision.xml    |   2 +-
 .../scripts/PackingList_adoptPrevision.xml    |   2 +-
 .../scripts/PackingList_afterEdit.xml         |   2 +-
 ...ortisationTransactionContent_afterEdit.xml |   2 +-
 ...ontent_updateRelatedSimulationMovement.xml |   2 +-
 .../AmortisationTransaction_afterAdd.xml      |   2 +-
 ...action_updateRelatedSimulationMovement.xml |   2 +-
 .../immobilisation_delivery_workflow.xml      |  64 ++++++
 .../scripts.xml                               | 200 ++++++++++++++++++
 .../states.xml                                |  46 ++++
 .../states/delivered.xml                      | 100 +++++++++
 .../transitions.xml                           |  46 ++++
 .../variables.xml                             |  46 ++++
 .../variables/action.xml                      |  85 ++++++++
 .../variables/actor.xml                       |  85 ++++++++
 .../variables/comment.xml                     |  85 ++++++++
 .../variables/history.xml                     |  85 ++++++++
 .../variables/portal_type.xml                 |  60 ++++++
 .../variables/start_date.xml                  |  85 ++++++++
 .../variables/stop_date.xml                   |  85 ++++++++
 .../variables/time.xml                        |  85 ++++++++
 .../worklists.xml                             |  46 ++++
 ...ationContent_updateImmobilisationState.xml |   2 +-
 ...dateFutureMovementsImmobilisationState.xml |   2 +-
 ...mobilisation_updateImmobilisationState.xml |   2 +-
 .../PackingListContent_beforeDelete.xml       |   2 +-
 ...kingListContent_updatePackingListState.xml |   2 +-
 .../scripts/PackingList_updateAppliedRule.xml |   2 +-
 .../ImmobilisationMovement_afterEdit.xml      |   2 +-
 .../ImmobilisationMovement_beforeEdit.xml     |   2 +-
 bt5/erp5_immobilisation/bt/change_log         |   7 +
 bt5/erp5_immobilisation/bt/description        |   9 +-
 .../bt/template_catalog_result_table_list     |   1 -
 .../template_portal_type_workflow_chain_list  |   6 +
 .../bt/template_workflow_id_list              |   1 +
 160 files changed, 1495 insertions(+), 254 deletions(-)
 create mode 100755 bt5/erp5_immobilisation/LocalRolesTemplateItem/.xml
 create mode 100755 bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
 create mode 100755 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml

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 f8bc2eab14..c0673d1fd1 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 d2744141be..02f19ed94b 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 6b4c60be35..0046e22ab5 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 882a1b10d3..e8e5677d22 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 489ec9af7d..7b06be8a65 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 fc911ca72e..def2b761d5 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 b293b729c2..a08f74340b 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 d2744141be..02f19ed94b 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 e567081e77..b328adf436 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 7f7ebc00e2..203723c7c1 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 dc93034f8b..53644cdbe3 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 dfeeca502f..aec0d852d6 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 089782cbc2..ee2038fea2 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 799ec8652d..b9b9087faf 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 48baa2f536..ce520bf3c2 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 602dbf128b..fcf63bce40 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 cb200e2d27..7d1b6e3e16 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 5938b64928..c081e6af62 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 79d159a502..700146dcef 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 ba135248bd..aa4462196a 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 089782cbc2..ee2038fea2 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 03ffd53572..49590cdc31 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 799ec8652d..b9b9087faf 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 3219b89697..c26957842c 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 fd640bbfcc..be0a4d57d6 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 03ffd53572..49590cdc31 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 03ffd53572..49590cdc31 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 03ffd53572..49590cdc31 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 f4c82ac3f5..05bfa5d4cf 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 5cf65e7812..5e5cc58c37 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 f255b34f49..0efafccf61 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 cd2b0a6c1c..101381d545 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 76ab36de56..177820ebcc 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 03ffd53572..49590cdc31 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 4487f64747..2e6cd778d7 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 18ec2630cb..6736e90640 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 809e492b30..9f652753fd 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 f1c7d7dc6f..725767b548 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 0000000000..6ead7bdf62
--- /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 60770d3ca5..1cb0725d7c 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 0000000000..600ebe860d
--- /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 08edc7b8f2..33c8a5927d 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 5563f3d96b..0d69e5e217 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 cfdf59933b..a082218fd8 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 5d0bf46d78..83eb0091b3 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 06e5736379..7ab79199bf 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 b9f414cf71..c2f4787a9b 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 a7427a6c6a..9bf244e0ff 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 df7eda264f..f6f04e1bbb 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 db1be26054..c093578729 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 0253613f24..5c752ecd8f 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 751b9ad9b8..b1545b9e23 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 914698c210..d934058335 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 ba8c09c012..757c6f3649 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 cdfcf6d7c0..08dc8621a6 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 bb58303191..6646010e5f 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 d17ba59a8b..a5910ee0fc 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 e02ec56699..09db4f14c2 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 793d3da71d..56f60a6e0f 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 3b80044284..2d2019e2e2 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 f6beec40f9..1612e44a6e 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 4b492042a6..fbb3c2516e 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 97a3c28f85..35093d145c 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 e5e7b0d663..2bf210e0fc 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 af6ecf5cd6..cce41c6a7a 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 b25fbf6be4..751ded9e5b 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 ca0f7bb48e..5d90c0ffb3 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 ef47e32cd9..ae1d095cc9 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 d180daa47d..77a5561455 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 7497cdc7af..4522325c12 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 f259e378b3..e95b998fd5 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 b4dd30e0e6..8a38c4b238 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 7102bd0ce4..706c486fa5 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 b2a8be652d..5c7052517d 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 1908c648db..17117bfa27 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 13e3eeb4da..1ec24e3bd0 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 af3e19bce7..564b877e2e 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 dc34e6f112..9fc7578c14 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 f77e949d23..44e09836e5 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 dc6a4239da..5f37dbc9ef 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 60648be1ce..a9e9f1b896 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 349aa6f715..0bc91b955d 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 aa48cc89a4..832c6bbff4 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 97fd527a90..831df11768 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 ec9c0f8dc4..9ae7f60722 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 42454d2d84..c389305175 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 b48c6d7980..9c7238fc2d 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 225eded7b1..3bd9f4c16a 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 5de206056c..70e98612dd 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 bccdbc2c5c..e62917bfcd 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 70821d47e3..8fd8fbe14c 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 ab59e89967..b3a4768bec 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 0000000000..069c493b91
--- /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 0000000000..091664a6e2
--- /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 0000000000..9653d814da
--- /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 0000000000..ddba2b4e03
--- /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 0000000000..eec7ba7928
--- /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 0000000000..d36f9e73c8
--- /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 0000000000..e2d54b25d7
--- /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 0000000000..b81346a188
--- /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 0000000000..05ac72139e
--- /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 0000000000..2a212275cf
--- /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 0000000000..aaacee8edc
--- /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 0000000000..eefa0e2162
--- /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 0000000000..23960e36b7
--- /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 0000000000..a389129998
--- /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 0000000000..055366cf24
--- /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 8af2a9fa3b..6d22b948fe 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 ec4542610a..8e74c5ecdf 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 deb2c8f724..5992f0a7ad 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 1b543e8345..b5c39dbe8f 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 2f139b825d..19bfd50a6e 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 69804b63e3..7705ac2db5 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 b5ad94d198..739a3586af 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 e829c623d2..9074fd6c5e 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 c4c5379a7b..d826ac80b3 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 6c94664afa..28559a2e83 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 a713074253..e69de29bb2 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 8896b5340c..3c6e40aef2 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 188db866ac..554c7eec2f 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
-- 
2.30.9