From 0ffdda1287bc24cfbc81cc39dc1156ed6461943c Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Fri, 9 Mar 2007 16:31:58 +0000
Subject: [PATCH] - make sure workflow actions on the packing list workflow
 will generate expand on immobilised items. - also the xml structure had many
 changes.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13312 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../build_amortisation.xml                    |   4 -
 .../Amortisation%20Rule/history.xml           |  89 ----
 .../Amortisation%20Rule/metadata.xml          |  89 ----
 .../Amortisation%20Rule/print.xml             |  89 ----
 .../portal_types/Amortisation%20Rule/view.xml |  89 ----
 .../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 -
 .../z_related_aggregate.catalog_keys.xml      |  12 -
 .../amortisation_account.xml                  |  58 ++-
 .../depreciation_account.xml                  |  58 ++-
 .../portal_categories/extra_cost_account.xml  |  58 ++-
 .../immobilisation_account.xml                |  58 ++-
 .../immobilisation_vat_account.xml            |  58 ++-
 .../portal_categories/input_account.xml       |  58 ++-
 .../monthly_amortisation_account.xml          |  58 ++-
 .../portal_categories/output_account.xml      |  58 ++-
 .../immobilisation_module.xml                 | 419 +++++++++++-------
 .../amortisation_transaction_builder.xml      |  27 --
 .../default_amortisation_rule/1.xml           | 129 ------
 .../PortalTypeRolesTemplateItem/.xml          |   2 -
 ...tion_isUsingEuLinearAmortisationMethod.xml |   8 +-
 ...singEuNoAmortisationAmortisationMethod.xml |   8 +-
 .../linear/ratioCalculation.xml               |   8 +-
 .../no_amortisation/ratioCalculation.xml      |   8 +-
 ...n_isUsingFrActualUseAmortisationMethod.xml |   8 +-
 ..._isUsingFrDegressiveAmortisationMethod.xml |   8 +-
 ...continuousDegressiveAmortisationMethod.xml |   8 +-
 .../actual_use/ratioCalculation.xml           |   8 +-
 .../degressive/ratioCalculation.xml           |   8 +-
 .../ratioCalculation.xml                      |   8 +-
 ...e_activateBuildAmortisationTransaction.xml |   8 +-
 ...ildAmortisationTransactionDialogScript.xml |   8 +-
 ...ionModule_buildAmortisationTransaction.xml |   8 +-
 ...ortisationSystem_addAmortisationMethod.xml |   8 +-
 ...tisationTransaction_activateAfterBuild.xml |   8 +-
 .../AmortisationTransaction_afterBuild.xml    |   8 +-
 ...rtisationTransaction_jumpToRelatedItem.xml |  33 +-
 ...AmortisationTransaction_selectDelivery.xml |   8 +-
 ...AmortisationTransaction_selectMovement.xml |   8 +-
 .../Delivery_getTotalImmobilisedPrice.xml     |   8 +-
 .../Immobilisation_getAccounts.xml            |   8 +-
 ...ation_getAmortisationMethodDisplayList.xml |   8 +-
 ...mobilisation_getAmortisationMethodList.xml |   8 +-
 ...tion_getTransactionDeliveryRelatedInfo.xml |   8 +-
 ...isation_getValidityErrorTranslatedList.xml |   8 +-
 .../Immobilisation_isInvalid.xml              |   8 +-
 .../Immobilisation_showImmobilisationTab.xml  |   8 +-
 ...em_getImmobilisationPeriodAsObjectList.xml |   8 +-
 .../Item_jumpToAmortisationTransaction.xml    |  33 +-
 ...ationDelivery_addImmobilisationActions.xml |   8 +-
 ...nMovement_addAmortisationMethodActions.xml |   8 +-
 ...rtalType_Item_addImmobilisationActions.xml |   8 +-
 ...isation_transaction_causality_workflow.xml |   6 +
 .../scripts.xml                               | 154 -------
 ...AmortisationTransaction_acceptDecision.xml |  33 +-
 ...AmortisationTransaction_adoptPrevision.xml |  33 +-
 .../AmortisationTransaction_afterEdit.xml     |   8 +-
 .../scripts/PackingList_acceptDecision.xml    |  33 +-
 .../scripts/PackingList_adoptPrevision.xml    |  33 +-
 .../scripts/PackingList_afterEdit.xml         |   8 +-
 ...ation_transaction_interaction_workflow.xml |   6 +
 ...ortisationTransactionContent_afterEdit.xml |   8 +-
 ...ontent_updateRelatedSimulationMovement.xml |  36 +-
 .../AmortisationTransaction_afterAdd.xml      |   8 +-
 ...action_updateRelatedSimulationMovement.xml |  36 +-
 .../immobilisation_delivery_workflow.xml      |   6 +
 .../scripts.xml                               | 154 -------
 ...lisation_movement_interaction_workflow.xml |   6 +
 .../ImmobilisationContent_edit.xml            |   2 -
 .../Immobilisation_doWorkflowAction.xml       |  98 ++++
 ...ationContent_updateImmobilisationState.xml |  36 +-
 ...mobilisation_updateImmobilisationState.xml |  36 +-
 .../PackingListContent_beforeDelete.xml       |  33 +-
 ...kingListContent_updatePackingListState.xml |  33 +-
 .../scripts/PackingList_updateAppliedRule.xml |   8 +-
 .../immobilisation_workflow.xml               |   6 +
 .../ImmobilisationMovement_afterEdit.xml      |  11 +-
 .../ImmobilisationMovement_beforeEdit.xml     |  11 +-
 bt5/erp5_immobilisation/bt/maintainer_list    |   0
 bt5/erp5_immobilisation/bt/provision_list     |   0
 bt5/erp5_immobilisation/bt/revision           |   1 +
 bt5/erp5_immobilisation/bt/short_title        |   1 +
 .../bt/template_preference_list               |   0
 ...template_update_business_template_workflow |   1 +
 .../bt/template_update_tool                   |   1 +
 156 files changed, 1063 insertions(+), 1794 deletions(-)
 delete mode 100644 bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
 delete mode 100644 bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
 delete mode 100644 bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
 delete mode 100644 bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
 delete mode 100644 bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/1.xml
 delete mode 100644 bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
 create mode 100644 bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_doWorkflowAction.xml
 create mode 100644 bt5/erp5_immobilisation/bt/maintainer_list
 create mode 100644 bt5/erp5_immobilisation/bt/provision_list
 create mode 100644 bt5/erp5_immobilisation/bt/short_title
 create mode 100644 bt5/erp5_immobilisation/bt/template_preference_list
 create mode 100644 bt5/erp5_immobilisation/bt/template_update_business_template_workflow
 create mode 100644 bt5/erp5_immobilisation/bt/template_update_tool

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 c0673d1fd1..7cb815de09 100644
--- 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
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>build_amortisation</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
deleted file mode 100644
index 6f8def5339..0000000000
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>6.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</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>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
deleted file mode 100644
index 9bcfc78687..0000000000
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage portal</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>8.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</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>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
deleted file mode 100644
index f871a92fc4..0000000000
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>10.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</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>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
deleted file mode 100644
index 97da81ac4e..0000000000
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>View</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</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>string:${object_url}/Rule_view</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
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 02f19ed94b..16b38d9900 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0046e22ab5..44fa3649b9 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 e8e5677d22..f871a92fc4 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 7b06be8a65..c7e4311b26 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction%20Line/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 def2b761d5..9d1bba910c 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/causality_report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>causality_report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 a08f74340b..003bd1112a 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 02f19ed94b..16b38d9900 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 b328adf436..5b08bbb5bc 100644
--- 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
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>jump_causality_items</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 203723c7c1..83dd28499f 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 53644cdbe3..609ad84fc0 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 aec0d852d6..c01919233d 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 ee2038fea2..20592e1ec8 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 b9b9087faf..bb0ddd9d25 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 ce520bf3c2..538f2bbc3b 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 fcf63bce40..6cc422ea67 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 7d1b6e3e16..018a6eda21 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/list_ui.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>list_ui</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 c081e6af62..a1393d8768 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 700146dcef..c2696605a5 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/sort_on.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>sort_on</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 aa4462196a..1026d02eed 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
index ee2038fea2..20592e1ec8 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 49590cdc31..36e1f9fcd3 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/immobilisation_validity_errors.xml
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_validity_errors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
index b9b9087faf..bb0ddd9d25 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
index c26957842c..32fb9855b2 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
index be0a4d57d6..2355f448ab 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 49590cdc31..36e1f9fcd3 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_validity_errors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 49590cdc31..36e1f9fcd3 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Inventory/immobilisation_validity_errors.xml
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_validity_errors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 49590cdc31..36e1f9fcd3 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_validity_errors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 05bfa5d4cf..76593988ef 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_linear_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 5e5cc58c37..8de797fc63 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>eu_no_amortisation_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 0efafccf61..023a89b3ed 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_actual_use_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 101381d545..6ec2ade39c 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 177820ebcc..4cf204f231 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>fr_uncontinuous_degressive_amortisation_method_view_details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
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 49590cdc31..36e1f9fcd3 100644
--- 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
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_validity_errors</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.catalog_keys.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.catalog_keys.xml
index 5c39c42c6e..7d6996cb9c 100644
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.catalog_keys.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.catalog_keys.xml
@@ -1,14 +1,2 @@
 <catalog_method>
- <item key="_is_catalog_list_method_archive" type="int">
-  <value>0</value>
- </item>
- <item key="_is_uncatalog_method_archive" type="int">
-  <value>0</value>
- </item>
- <item key="_is_clear_method_archive" type="int">
-  <value>0</value>
- </item>
- <item key="_is_filtered_archive" type="int">
-  <value>0</value>
- </item>
 </catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
index 7a4ef06853..d67707e7f1 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -83,17 +77,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -104,6 +102,12 @@
             <key> <string>id</string> </key>
             <value> <string>amortisation_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -130,6 +134,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -148,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml
index 85eaa5401f..b0e6e186ad 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -83,17 +77,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -104,6 +102,12 @@
             <key> <string>id</string> </key>
             <value> <string>depreciation_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -130,6 +134,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -148,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
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 6736e90640..17fecd80ae 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -86,17 +80,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -107,6 +105,12 @@
             <key> <string>id</string> </key>
             <value> <string>extra_cost_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -133,6 +137,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -151,6 +183,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml
index 684574bb34..12e75bb1ac 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -83,17 +77,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -104,6 +102,12 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -130,6 +134,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -148,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
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 9d3aef098b..c86d0d1132 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -85,17 +79,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -106,6 +104,12 @@
             <key> <string>id</string> </key>
             <value> <string>immobilisation_vat_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -132,6 +136,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -150,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml
index c53a46ccc8..de68479a67 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -83,17 +77,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -104,6 +102,12 @@
             <key> <string>id</string> </key>
             <value> <string>input_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -130,6 +134,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -148,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
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 725767b548..e197024f15 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -86,17 +80,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -107,6 +105,12 @@
             <key> <string>id</string> </key>
             <value> <string>monthly_amortisation_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -133,6 +137,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -151,6 +183,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml
index d0ca45b10c..7870cacc32 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,12 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -83,17 +77,21 @@
             </value>
         </item>
         <item>
-            <key> <string>criterion_property</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -104,6 +102,12 @@
             <key> <string>id</string> </key>
             <value> <string>output_account</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id_group</string> </key>
             <value> <string>None</string> </value>
@@ -130,6 +134,34 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>test_method_id</string> </key>
             <value>
@@ -148,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
index e77becf105..0470d3005d 100644
--- a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
+++ b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml
@@ -1,492 +1,579 @@
 <module>
  <id>immobilisation_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCalendar Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFWiki Comment</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ChartObject</name>
+  </permission>
+  <permission type='list'>
+   <name>Add ChartTemplate</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Elements</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slot Classs</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Slots</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composite Tools</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Composites</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
+  </permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add RenderableObject</name>
+  </permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ZGDCharts</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Zope Schedulers</name>
+  </permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change CMFWiki Regulations</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change Composites</name>
+  </permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change ZGDChart</name>
+  </permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create CMFWiki Page</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit CMFWiki Page</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Edit target</name>
+  </permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage Groups</name>
+  </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Move CMFWiki Page</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
   </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Manage scheduling task</name>
+  </permission>
+  <permission type='list'>
+   <name>ZopeScheduler: Schedule tasks</name>
+  </permission>
  </permission_list>
  <portal_type>Immobilisation Module</portal_type>
  <title>Immobilisations</title>
diff --git a/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml b/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml
index afa9104f16..c20bf51a28 100644
--- a/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml
+++ b/bt5/erp5_immobilisation/PathTemplateItem/portal_deliveries/amortisation_transaction_builder.xml
@@ -164,12 +164,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_history</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
@@ -213,25 +207,4 @@
       <none/>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/1.xml b/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/1.xml
deleted file mode 100644
index 69b887e975..0000000000
--- a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/1.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>solver_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Quantity Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>solver_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>default_quantity_tester</string> </value>
-        </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml b/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
deleted file mode 100644
index 600ebe860d..0000000000
--- a/bt5/erp5_immobilisation/PortalTypeRolesTemplateItem/.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<type_roles>
-</type_roles>
\ No newline at end of file
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 83eb0091b3..29b015e7ea 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuLinearAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 7ab79199bf..aaab44f453 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/Immobilisation_isUsingEuNoAmortisationAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 c2f4787a9b..6413c54b19 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,7 +81,9 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/linear/ratioCalculation</string> </value>
+            <value>
+              <none/>
+            </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 9bf244e0ff..dac1f29301 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,7 +81,9 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_eu/no_amortisation/ratioCalculation</string> </value>
+            <value>
+              <none/>
+            </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 f6f04e1bbb..0c16a0de1a 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrActualUseAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 c093578729..5829a4d9a6 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrDegressiveAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 5c752ecd8f..4793cea488 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/Immobilisation_isUsingFrUncontinuousDegressiveAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 b1545b9e23..5698775198 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -94,7 +96,9 @@ except ZeroDivisionError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/actual_use/ratioCalculation</string> </value>
+            <value>
+              <none/>
+            </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 d934058335..1dda5aeaf6 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -103,7 +105,9 @@ except IndexError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/degressive/ratioCalculation</string> </value>
+            <value>
+              <none/>
+            </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 757c6f3649..e97f8fcc59 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -103,7 +105,9 @@ except IndexError:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting_fr/uncontinuous_degressive/ratioCalculation</string> </value>
+            <value>
+              <none/>
+            </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 08dc8621a6..84660b5b53 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -89,7 +91,9 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_activateBuildAmortisationTransaction</string> </value>
+            <value>
+              <none/>
+            </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 6646010e5f..4196c09d8f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -101,7 +103,9 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_beforeBuildAmortisationTransactionDialogScript</string> </value>
+            <value>
+              <none/>
+            </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 a5910ee0fc..c9be0433ce 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -102,7 +104,9 @@ context.portal_deliveries.amortisation_transaction_builder.build(**builder_kw)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransaction</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 2d2019e2e2..00f03328fe 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -133,7 +135,9 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod</string> </value>
+            <value>
+              <none/>
+            </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 1612e44a6e..dd36e1f159 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_activateAfterBuild</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 fbb3c2516e..75c8f30f8c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -110,7 +112,9 @@ context.activate(after_tag=\'after_amortisation_build\').updateCausalityState()\
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_afterBuild</string> </value>
+            <value>
+              <none/>
+            </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 35093d145c..aca76fce7a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -93,15 +95,11 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_jumpToRelatedItem</string> </value>
-        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
@@ -180,25 +178,4 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 2bf210e0fc..b34ba21afc 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -83,7 +85,9 @@ return return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_selectDelivery</string> </value>
+            <value>
+              <none/>
+            </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 cce41c6a7a..7865d73373 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,7 +81,9 @@ return filter(lambda x: len(x.getDeliveryValueList())==0, movement_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/AmortisationTransaction_selectMovement</string> </value>
+            <value>
+              <none/>
+            </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 751ded9e5b..b8791f9ad2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -98,7 +100,9 @@ return price\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Delivery_getTotalImmobilisedPrice</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 77a5561455..0fc2f628b7 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAccounts.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -98,7 +100,9 @@ return [(\'\',\'\')] + getList()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAccounts</string> </value>
+            <value>
+              <none/>
+            </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 fb18b7b30a..fadfafb7ff 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,7 +89,9 @@ return [(\'\',\'\')] + return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList</string> </value>
+            <value>
+              <none/>
+            </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 e95b998fd5..67c5058626 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -93,7 +95,9 @@ return return_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodList</string> </value>
+            <value>
+              <none/>
+            </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 8a38c4b238..95c891faa5 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -127,7 +129,9 @@ return returned_value\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getTransactionDeliveryRelatedInfo</string> </value>
+            <value>
+              <none/>
+            </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 706c486fa5..c83a46331f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -104,7 +106,9 @@ return translated_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_getValidityErrorTranslatedList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 5c7052517d..3b8e91becc 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_isInvalid.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,9 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_isInvalid</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 17117bfa27..fe07a63d53 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -81,7 +83,9 @@ return 1\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Immobilisation_showImmobilisationTab</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 564b877e2e..b51c130ca9 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -94,7 +96,9 @@ return immo_object_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Item_getImmobilisationPeriodAsObjectList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
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 9fc7578c14..14782787ba 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -91,15 +93,11 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/Item_jumpToAmortisationTransaction</string> </value>
-        </item>
         <item>
             <key> <string>_owner</string> </key>
             <value>
@@ -178,25 +176,4 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 5f37dbc9ef..8b25b03697 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -103,7 +105,9 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_ImmobilisationDelivery_addImmobilisationActions</string> </value>
+            <value>
+              <none/>
+            </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 a9e9f1b896..52e697405c 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -120,7 +122,9 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_ImmobilisationMovement_addAmortisationMethodActions</string> </value>
+            <value>
+              <none/>
+            </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 0bc91b955d..4aab76518b 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -111,7 +113,9 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_immobilisation/PortalType_Item_addImmobilisationActions</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow.xml
index ff708a0131..36f5a3142f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>amortisation_transaction_causality_workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts.xml
index 091664a6e2..c5f5085430 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/scripts.xml
@@ -40,160 +40,6 @@
               <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>
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 832c6bbff4..06bf5cc8e4 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,15 +89,11 @@ transaction.activate().updateCausalityState()\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_acceptDecision</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -159,25 +157,4 @@ transaction.activate().updateCausalityState()\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 831df11768..2ea6ab2db0 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -91,15 +93,11 @@ transaction.activate().updateCausalityState()\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_adoptPrevision</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -164,25 +162,4 @@ transaction.activate().updateCausalityState()\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 9ae7f60722..80b5b238e3 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -78,7 +80,9 @@ context.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/AmortisationTransaction_afterEdit</string> </value>
+            <value>
+              <none/>
+            </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 c389305175..35fc3c79c1 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -89,15 +91,11 @@ packing_list.activate().updateCausalityState()\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_acceptDecision</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -157,25 +155,4 @@ packing_list.activate().updateCausalityState()\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 9c7238fc2d..40333a63de 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -95,15 +97,11 @@ packing_list.activate().updateCausalityState()\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_adoptPrevision</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -165,25 +163,4 @@ packing_list.activate().updateCausalityState()\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 3bd9f4c16a..5b4e0817dc 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,7 +81,9 @@ if context.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_causality_workflow/scripts/PackingList_afterEdit</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow.xml
index aa8cb9912c..e73fc4c0b1 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>amortisation_transaction_interaction_workflow</string> </value>
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 70e98612dd..d245f22cba 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,7 +81,9 @@ object.getRootDeliveryValue().edit()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_afterEdit</string> </value>
+            <value>
+              <none/>
+            </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 ad87850b70..d3525e3740 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -78,15 +80,11 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransactionContent_updateRelatedSimulationMovement</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -122,9 +120,10 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>line</string>
                             <string>_getiter_</string>
+                            <string>_getattr_</string>
                             <string>simulation_movement</string>
                           </tuple>
                         </value>
@@ -153,25 +152,4 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 8fd8fbe14c..07d9d9b0dd 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -78,7 +80,9 @@ transaction.log(\'after add on transaction\',transaction)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_afterAdd</string> </value>
+            <value>
+              <none/>
+            </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 2f4fe32cfa..b5b664178d 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,15 +81,11 @@ for line in delivery.getMovementList():\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/amortisation_transaction_interaction_workflow/scripts/AmortisationTransaction_updateRelatedSimulationMovement</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -123,9 +121,10 @@ for line in delivery.getMovementList():\n
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>delivery</string>
                             <string>_getiter_</string>
+                            <string>_getattr_</string>
                             <string>line</string>
                             <string>simulation_movement</string>
                           </tuple>
@@ -155,25 +154,4 @@ for line in delivery.getMovementList():\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
index 069c493b91..a317d315ea 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>immobilisation_delivery_workflow</string> </value>
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
index 091664a6e2..c5f5085430 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/scripts.xml
@@ -40,160 +40,6 @@
               <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>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow.xml
index 87cfcf304d..a74f0014d0 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>immobilisation_movement_interaction_workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/ImmobilisationContent_edit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/ImmobilisationContent_edit.xml
index d63549d7de..38f136ddc4 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/ImmobilisationContent_edit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/ImmobilisationContent_edit.xml
@@ -77,8 +77,6 @@
                 <string>Inventory Line</string>
                 <string>Purchase Packing List Cell</string>
                 <string>Purchase Packing List Line</string>
-                <string>Reevaluation Packing List Line</string>
-                <string>Restoration Packing List Line</string>
                 <string>Sale Packing List Cell</string>
                 <string>Sale Packing List Line</string>
               </list>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_doWorkflowAction.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_doWorkflowAction.xml
new file mode 100644
index 0000000000..c4d15a408c
--- /dev/null
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_doWorkflowAction.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5.Interaction</string>
+          <string>InteractionDefinition</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>activate_script_name</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value>
+              <list>
+                <string>Immobilisation_updateImmobilisationState</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Immobilisation_doWorkflowAction</string> </value>
+        </item>
+        <item>
+            <key> <string>method_id</string> </key>
+            <value>
+              <list>
+                <string>set_ready</string>
+                <string>start</string>
+                <string>stop</string>
+                <string>deliver</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type_filter</string> </key>
+            <value>
+              <list>
+                <string>Purchase Packing List</string>
+                <string>Sale Packing List</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>2</int> </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 6aa79a9de6..e2356bc662 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -79,15 +81,11 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/ImmobilisationContent_updateImmobilisationState</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -127,8 +125,9 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>immobilisation_content</string>
+                            <string>_getattr_</string>
                             <string>immobilisation</string>
                           </tuple>
                         </value>
@@ -157,25 +156,4 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 ca58bd009f..62f4e37674 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -78,15 +80,11 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateImmobilisationState</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -126,8 +124,9 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>immobilisation</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>
@@ -155,25 +154,4 @@ if immobilisation.getImmobilisationState() != \'calculating\':\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 b5c39dbe8f..c330c0e804 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -97,15 +99,11 @@ for simulation_movement in simulation_movement_list:\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_beforeDelete</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -168,25 +166,4 @@ for simulation_movement in simulation_movement_list:\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 19bfd50a6e..91dced4c14 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -80,15 +82,11 @@ if packing_list_content.getSimulationState()!=\'draft\':\n
             </value>
         </item>
         <item>
-            <key> <string>_dav_writelocks</string> </key>
+            <key> <string>_filepath</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingListContent_updatePackingListState</string> </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
@@ -148,25 +146,4 @@ if packing_list_content.getSimulationState()!=\'draft\':\n
       </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/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
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 7705ac2db5..93d34cf0bc 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,7 +89,9 @@ if packing_list.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_updateAppliedRule</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
index 072961d69f..5d569c8676 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
@@ -30,6 +30,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>immobilisation_workflow</string> </value>
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 7d2e133e02..e02fa6291a 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -91,7 +93,9 @@ context.activate(\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_afterEdit</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -133,8 +137,9 @@ context.activate(\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>context</string>
+                            <string>_getattr_</string>
                             <string>_getiter_</string>
                             <string>movement</string>
                             <string>movement_list</string>
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 53e1673aa9..3dc1044d2b 100644
--- 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
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -81,7 +83,9 @@ context.ImmobilisationDelivery_expandAggregatedItems()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_workflow/immobilisation_workflow/scripts/ImmobilisationMovement_beforeEdit</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -123,9 +127,10 @@ context.ImmobilisationDelivery_expandAggregatedItems()\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>context</string>
                             <string>_getiter_</string>
+                            <string>_getattr_</string>
                             <string>movement</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_immobilisation/bt/maintainer_list b/bt5/erp5_immobilisation/bt/maintainer_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_immobilisation/bt/provision_list b/bt5/erp5_immobilisation/bt/provision_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_immobilisation/bt/revision b/bt5/erp5_immobilisation/bt/revision
index e69de29bb2..d8263ee986 100644
--- a/bt5/erp5_immobilisation/bt/revision
+++ b/bt5/erp5_immobilisation/bt/revision
@@ -0,0 +1 @@
+2
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/bt/short_title b/bt5/erp5_immobilisation/bt/short_title
new file mode 100644
index 0000000000..4af18322e3
--- /dev/null
+++ b/bt5/erp5_immobilisation/bt/short_title
@@ -0,0 +1 @@
+None
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/bt/template_preference_list b/bt5/erp5_immobilisation/bt/template_preference_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_immobilisation/bt/template_update_business_template_workflow b/bt5/erp5_immobilisation/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_immobilisation/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/bt/template_update_tool b/bt5/erp5_immobilisation/bt/template_update_tool
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/bt5/erp5_immobilisation/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
-- 
2.30.9