From 608343565dde139949253469b3002d52d75c388c Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Wed, 8 Oct 2008 09:50:25 +0000
Subject: [PATCH] 2008-10-8 yusei * Update xml format.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24094 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../build_amortisation.xml                    | 20 ++-------
 ...ems_to_build_amortisation_transactions.xml | 20 ++-------
 .../Amortisation%20Rule/history.xml           | 20 ++-------
 .../Amortisation%20Rule/metadata.xml          | 20 ++-------
 .../Amortisation%20Rule/print.xml             | 20 ++-------
 .../portal_types/Amortisation%20Rule/view.xml | 20 ++-------
 .../history.xml                               | 20 ++-------
 .../metadata.xml                              | 20 ++-------
 .../print.xml                                 | 20 ++-------
 .../view.xml                                  | 20 ++-------
 .../causality_report.xml                      | 20 ++-------
 .../Amortisation%20Transaction/details.xml    | 20 ++-------
 .../Amortisation%20Transaction/history.xml    | 20 ++-------
 .../jump_causality_items.xml                  | 20 ++-------
 .../Amortisation%20Transaction/metadata.xml   | 20 ++-------
 .../Amortisation%20Transaction/print.xml      | 20 ++-------
 .../Amortisation%20Transaction/view.xml       | 20 ++-------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 31 +++-----------
 ...ation_amortisation_method_view_details.xml | 31 +++-----------
 ...l_use_amortisation_method_view_details.xml | 31 +++-----------
 ...ssive_amortisation_method_view_details.xml | 31 +++-----------
 ...ssive_amortisation_method_view_details.xml | 31 +++-----------
 .../Immobilisation%20Line/history.xml         | 24 ++---------
 .../Immobilisation%20Line/metadata.xml        | 24 ++---------
 .../Immobilisation%20Line/print.xml           | 24 ++---------
 .../Immobilisation%20Line/view.xml            | 24 ++---------
 .../Immobilisation%20Module/list_ui.xml       | 24 ++---------
 .../Immobilisation%20Module/print.xml         | 24 ++---------
 .../Immobilisation%20Module/sort_on.xml       | 24 ++---------
 .../Immobilisation%20Module/view.xml          | 24 ++---------
 .../portal_types/Immobilisation/history.xml   | 20 ++-------
 .../immobilisation_validity_errors.xml        | 27 +++---------
 .../portal_types/Immobilisation/metadata.xml  | 20 ++-------
 .../portal_types/Immobilisation/print.xml     | 20 ++-------
 .../portal_types/Immobilisation/view.xml      | 20 ++-------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 .../immobilisation_validity_errors.xml        | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 .../immobilisation_validity_errors.xml        | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 .../immobilisation_validity_errors.xml        | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...inear_amortisation_method_view_details.xml | 27 +++---------
 ...ation_amortisation_method_view_details.xml | 27 +++---------
 ...l_use_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 ...ssive_amortisation_method_view_details.xml | 27 +++---------
 .../immobilisation_validity_errors.xml        | 27 +++---------
 .../erp5_mysql_innodb/z_related_aggregate.xml | 25 +++--------
 ..._translated_immobilisation_state_title.xml | 27 ++++--------
 .../amortisation_account.xml                  | 25 +----------
 .../depreciation_account.xml                  | 25 +----------
 .../portal_categories/extra_cost_account.xml  | 25 +----------
 .../immobilisation_account.xml                | 25 +----------
 .../immobilisation_vat_account.xml            | 25 +----------
 .../portal_categories/input_account.xml       | 25 +----------
 .../monthly_amortisation_account.xml          | 25 +----------
 .../portal_categories/output_account.xml      | 25 +----------
 .../default_amortisation_rule.xml             | 42 -------------------
 .../default_quantity_tester.xml               | 25 +----------
 .../portal_types/Amortisation%20Rule.xml      | 12 ------
 .../Amortisation%20Transaction%20Line.xml     | 19 +--------
 .../Amortisation%20Transaction.xml            | 19 +--------
 .../portal_types/Immobilisation%20Line.xml    | 19 +--------
 .../portal_types/Immobilisation%20Module.xml  | 19 +--------
 .../portal_types/Immobilisation.xml           | 19 +--------
 .../portal_skins/erp5_accounting_eu.xml       | 19 +--------
 ..._euLinearAmortisationMethodViewDetails.xml | 21 ++--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_extra_cost_account.xml                 | 13 +-----
 .../my_extra_cost_price.xml                   | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_immobilisation_vat.xml                 | 13 +-----
 .../my_immobilisation_vat_account.xml         | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_monthly_amortisation_account.xml       | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 ...rtisationAmortisationMethodViewDetails.xml | 21 ++--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_extra_cost_account.xml                 | 13 +-----
 .../my_extra_cost_price.xml                   | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_immobilisation_vat.xml                 | 13 +-----
 .../my_immobilisation_vat_account.xml         | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_monthly_amortisation_account.xml       | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 ...tion_isUsingEuLinearAmortisationMethod.xml | 31 +-------------
 ...singEuNoAmortisationAmortisationMethod.xml | 31 +-------------
 .../erp5_accounting_eu/linear.xml             | 19 +--------
 .../linear/ratioCalculation.xml               | 31 +-------------
 .../erp5_accounting_eu/no_amortisation.xml    | 19 +--------
 .../no_amortisation/ratioCalculation.xml      | 31 +-------------
 .../portal_skins/erp5_accounting_fr.xml       | 19 +--------
 ...ActualUseAmortisationMethodViewDetails.xml | 21 ++--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_durability.xml                         | 13 +-----
 .../my_extra_cost_account.xml                 | 13 +-----
 .../my_extra_cost_price.xml                   | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_immobilisation_vat.xml                 | 13 +-----
 .../my_immobilisation_vat_account.xml         | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_monthly_amortisation_account.xml       | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 ...egressiveAmortisationMethodViewDetails.xml | 21 ++--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_degressive_coefficient.xml             | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_extra_cost_account.xml                 | 13 +-----
 .../my_extra_cost_price.xml                   | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_immobilisation_vat.xml                 | 13 +-----
 .../my_immobilisation_vat_account.xml         | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_monthly_amortisation_account.xml       | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 ...egressiveAmortisationMethodViewDetails.xml | 21 ++--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_degressive_coefficient.xml             | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_extra_cost_account.xml                 | 13 +-----
 .../my_extra_cost_price.xml                   | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_immobilisation_vat.xml                 | 13 +-----
 .../my_immobilisation_vat_account.xml         | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_monthly_amortisation_account.xml       | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 ...n_isUsingFrActualUseAmortisationMethod.xml | 31 +-------------
 ..._isUsingFrDegressiveAmortisationMethod.xml | 31 +-------------
 ...continuousDegressiveAmortisationMethod.xml | 31 +-------------
 .../erp5_accounting_fr/actual_use.xml         | 19 +--------
 .../actual_use/ratioCalculation.xml           | 31 +-------------
 .../actual_use_Immobilisation_viewDetails.xml | 19 +--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_default_amortisation_duration.xml      | 13 +-----
 .../my_default_amortisation_price.xml         | 13 +-----
 .../my_default_durability.xml                 | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_durability.xml                         | 13 +-----
 .../my_id.xml                                 | 13 +-----
 .../my_immobilisation.xml                     | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 .../my_stop_date.xml                          | 13 +-----
 .../my_vat.xml                                | 13 +-----
 .../my_vat_account.xml                        | 13 +-----
 .../validity.xml                              | 13 +-----
 .../erp5_accounting_fr/degressive.xml         | 19 +--------
 .../degressive/ratioCalculation.xml           | 31 +-------------
 .../degressive_Immobilisation_viewDetails.xml | 19 +--------
 .../my_amortisation_account.xml               | 13 +-----
 .../my_amortisation_duration.xml              | 13 +-----
 .../my_amortisation_start_price.xml           | 13 +-----
 .../my_default_amortisation_duration.xml      | 13 +-----
 .../my_default_amortisation_price.xml         | 13 +-----
 .../my_default_durability.xml                 | 13 +-----
 .../my_degressive_coefficient.xml             | 13 +-----
 .../my_depreciation_account.xml               | 13 +-----
 .../my_disposal_price.xml                     | 13 +-----
 .../my_durability.xml                         | 13 +-----
 .../my_id.xml                                 | 13 +-----
 .../my_immobilisation.xml                     | 13 +-----
 .../my_immobilisation_account.xml             | 13 +-----
 .../my_input_account.xml                      | 13 +-----
 .../my_output_account.xml                     | 13 +-----
 .../my_stop_date.xml                          | 13 +-----
 .../my_vat.xml                                | 13 +-----
 .../my_vat_account.xml                        | 13 +-----
 .../validity.xml                              | 13 +-----
 .../uncontinuous_degressive.xml               | 19 +--------
 .../ratioCalculation.xml                      | 31 +-------------
 .../portal_skins/erp5_immobilisation.xml      | 19 +--------
 ...e_activateBuildAmortisationTransaction.xml | 31 +-------------
 ...ildAmortisationTransactionDialogScript.xml | 31 +-------------
 ...ionModule_buildAmortisationTransaction.xml | 31 +-------------
 ...ule_buildAmortisationTransactionDialog.xml | 19 +--------
 .../item_title_list.xml                       | 13 +-----
 .../my_at_date.xml                            | 13 +-----
 .../my_item_uid_list.xml                      | 13 +-----
 ...isationTransactionSelectItemListDialog.xml | 19 +--------
 .../listbox.xml                               | 13 +-----
 .../AmortisationRule_asPredicate.xml          | 24 -----------
 ...ortisationSystem_addAmortisationMethod.xml | 31 +-------------
 .../AmortisationTransactionLine_view.xml      | 19 +--------
 .../my_destination_title.xml                  | 13 +-----
 .../my_resource.xml                           | 13 +-----
 .../my_source_credit.xml                      | 13 +-----
 .../my_source_debit.xml                       | 13 +-----
 .../my_source_title.xml                       | 13 +-----
 ...tisationTransaction_activateAfterBuild.xml | 24 -----------
 .../AmortisationTransaction_afterBuild.xml    | 24 -----------
 ...AmortisationTransaction_doSolveActions.xml | 24 -----------
 ...rtisationTransaction_jumpToRelatedItem.xml | 31 +-------------
 .../AmortisationTransaction_pdf_template.xml  | 19 +--------
 ...AmortisationTransaction_selectDelivery.xml | 31 +-------------
 ...AmortisationTransaction_selectMovement.xml | 31 +-------------
 .../AmortisationTransaction_view.xml          | 19 +--------
 .../AmortisationTransaction_view/listbox.xml  | 13 +-----
 .../listbox_destination.xml                   | 13 +-----
 .../listbox_source.xml                        | 13 +-----
 .../listbox_source_credit.xml                 | 13 +-----
 .../listbox_source_debit.xml                  | 13 +-----
 .../listbox_title.xml                         | 13 +-----
 .../my_description.xml                        | 13 +-----
 .../my_destination_reference.xml              | 13 +-----
 .../my_destination_section_title.xml          | 13 +-----
 .../my_reference.xml                          | 13 +-----
 .../my_resource.xml                           | 13 +-----
 .../my_source_reference.xml                   | 13 +-----
 .../my_source_section.xml                     | 13 +-----
 .../my_start_date.xml                         | 13 +-----
 .../AmortisationTransaction_view/my_title.xml | 13 +-----
 .../simulation_state.xml                      | 13 +-----
 .../AmortisationTransaction_viewAsPDF.xml     | 19 +--------
 .../AmortisationTransaction_viewDetails.xml   | 19 +--------
 .../listbox.xml                               | 13 +-----
 .../listbox_destination.xml                   | 13 +-----
 .../listbox_source.xml                        | 13 +-----
 .../listbox_source_credit.xml                 | 13 +-----
 .../listbox_source_debit.xml                  | 13 +-----
 .../listbox_title.xml                         | 13 +-----
 .../my_description.xml                        | 13 +-----
 .../my_destination_reference.xml              | 13 +-----
 .../my_destination_section_title.xml          | 13 +-----
 .../my_reference.xml                          | 13 +-----
 .../my_resource.xml                           | 13 +-----
 .../my_source_reference.xml                   | 13 +-----
 .../my_source_section.xml                     | 13 +-----
 .../my_start_date.xml                         | 13 +-----
 .../my_stop_date.xml                          | 13 +-----
 .../my_title.xml                              | 13 +-----
 .../simulation_state.xml                      | 13 +-----
 ...tionTransaction_viewSolveActionsDialog.xml | 13 +-----
 .../listbox.xml                               |  7 +---
 .../listbox_choice.xml                        |  7 +---
 .../listbox_quantity.xml                      |  7 +---
 ...mortisationTransaction_zSelectMovement.xml | 31 ++++----------
 .../Delivery_getTotalImmobilisedPrice.xml     | 32 ++------------
 ...lisationDelivery_expandAggregatedItems.xml | 24 -----------
 .../ImmobilisationLine_view.xml               | 19 +--------
 .../my_aggregate_title_list.xml               | 13 +-----
 .../my_amortisation_method.xml                | 13 +-----
 .../my_description.xml                        | 13 +-----
 .../ImmobilisationLine_view/my_title.xml      | 13 +-----
 ...ilisationModule_viewImmobilisationList.xml | 23 ++--------
 .../listbox.xml                               | 13 +-----
 .../listbox_delivery_stop_date.xml            | 25 +++++------
 .../Immobilisation_getAccounts.xml            | 31 +-------------
 ...ation_getAmortisationMethodDisplayList.xml | 31 +-------------
 ...mobilisation_getAmortisationMethodList.xml | 31 +-------------
 ...tion_getTransactionDeliveryRelatedInfo.xml | 31 +-------------
 ...isation_getValidityErrorTranslatedList.xml | 30 -------------
 .../Immobilisation_isInvalid.xml              | 31 +-------------
 .../Immobilisation_showImmobilisationTab.xml  | 31 +-------------
 .../Immobilisation_view.xml                   | 19 +--------
 .../Immobilisation_view/listbox.xml           | 13 +-----
 .../Immobilisation_view/my_comment.xml        | 13 +-----
 .../Immobilisation_view/my_stop_date.xml      | 13 +-----
 .../Immobilisation_view/my_title.xml          | 13 +-----
 ..._translated_immobilisation_state_title.xml | 13 +-----
 .../Immobilisation_viewValidityErrors.xml     | 19 +--------
 .../validity_errors.xml                       | 13 +-----
 ...em_getImmobilisationPeriodAsObjectList.xml | 31 +-------------
 .../Item_jumpToAmortisationTransaction.xml    | 31 +-------------
 .../Item_viewImmobilisationPeriods.xml        | 19 +--------
 .../Item_viewImmobilisationPeriods/errors.xml | 13 +-----
 .../listbox.xml                               | 13 +-----
 ...ationDelivery_addImmobilisationActions.xml | 31 +-------------
 ...nMovement_addAmortisationMethodActions.xml | 31 +-------------
 ...rtalType_Item_addImmobilisationActions.xml | 31 +-------------
 ...isation_transaction_causality_workflow.xml | 18 --------
 .../scripts.xml                               | 18 --------
 ...AmortisationTransaction_acceptDecision.xml | 24 -----------
 .../AmortisationTransaction_afterEdit.xml     | 24 -----------
 .../states.xml                                | 18 --------
 .../states/building.xml                       | 12 ------
 .../states/calculating.xml                    | 12 ------
 .../states/diverged.xml                       | 12 ------
 .../states/draft.xml                          | 12 ------
 .../states/solved.xml                         | 12 ------
 .../states/solving.xml                        | 12 ------
 .../transitions.xml                           | 18 --------
 .../transitions/accept_decision.xml           | 12 ------
 .../transitions/accept_decision_action.xml    | 12 ------
 .../transitions/adopt_prevision.xml           | 12 ------
 .../transitions/adopt_prevision_action.xml    | 12 ------
 .../transitions/calculate.xml                 | 12 ------
 .../transitions/converge.xml                  | 12 ------
 .../transitions/diverge.xml                   | 12 ------
 .../transitions/start_building.xml            | 12 ------
 .../variables.xml                             | 18 --------
 .../variables/action.xml                      | 18 --------
 .../variables/actor.xml                       | 18 --------
 .../variables/comment.xml                     | 18 --------
 .../variables/history.xml                     | 18 --------
 .../variables/portal_type.xml                 | 12 ------
 .../variables/start_date.xml                  | 18 --------
 .../variables/stop_date.xml                   | 18 --------
 .../variables/time.xml                        | 18 --------
 .../worklists.xml                             | 18 --------
 .../worklists/diverged.xml                    |  6 ---
 ...ation_transaction_interaction_workflow.xml | 12 ------
 .../interactions.xml                          | 12 ------
 .../AmortisationTransactionContent_delete.xml | 12 ------
 .../AmortisationTransactionContent_edit.xml   | 12 ------
 .../AmortisationTransaction_delete.xml        | 12 ------
 .../scripts.xml                               | 12 ------
 ...ortisationTransactionContent_afterEdit.xml | 24 -----------
 ...ontent_updateRelatedSimulationMovement.xml | 24 -----------
 ...action_updateRelatedSimulationMovement.xml | 24 -----------
 .../variables.xml                             | 12 ------
 .../worklists.xml                             | 12 ------
 .../immobilisation_delivery_workflow.xml      | 18 --------
 .../scripts.xml                               | 18 --------
 .../states.xml                                | 18 --------
 .../states/delivered.xml                      | 12 ------
 .../transitions.xml                           | 18 --------
 .../variables.xml                             | 18 --------
 .../variables/action.xml                      | 18 --------
 .../variables/actor.xml                       | 18 --------
 .../variables/comment.xml                     | 18 --------
 .../variables/history.xml                     | 18 --------
 .../variables/portal_type.xml                 | 12 ------
 .../variables/start_date.xml                  | 18 --------
 .../variables/stop_date.xml                   | 18 --------
 .../variables/time.xml                        | 18 --------
 .../worklists.xml                             | 18 --------
 ...lisation_movement_interaction_workflow.xml | 12 ------
 .../interactions.xml                          | 12 ------
 .../interactions/Immobilisation_edit.xml      | 12 ------
 .../Immobilisation_expandAmortisation.xml     | 12 ------
 .../interactions/Immobilisation_paste.xml     | 12 ------
 .../scripts.xml                               | 12 ------
 ...dateFutureMovementsImmobilisationState.xml | 24 -----------
 ...mobilisation_updateImmobilisationState.xml | 24 -----------
 ...expandAmortisationOnAggregateValueList.xml | 24 -----------
 .../variables.xml                             | 12 ------
 .../worklists.xml                             | 12 ------
 .../immobilisation_workflow.xml               | 12 ------
 .../immobilisation_workflow/scripts.xml       | 12 ------
 .../ImmobilisationMovement_afterEdit.xml      | 24 -----------
 .../ImmobilisationMovement_beforeEdit.xml     | 24 -----------
 .../immobilisation_workflow/states.xml        | 12 ------
 .../states/calculating.xml                    | 12 ------
 .../states/invalid.xml                        | 12 ------
 .../immobilisation_workflow/states/valid.xml  | 12 ------
 .../immobilisation_workflow/transitions.xml   | 12 ------
 .../calculate_immobilisation_validity.xml     | 12 ------
 .../transitions/invalidate_immobilisation.xml | 12 ------
 .../transitions/validate_immobilisation.xml   | 12 ------
 .../immobilisation_workflow/variables.xml     | 12 ------
 .../variables/action.xml                      | 12 ------
 .../variables/actor.xml                       | 12 ------
 .../variables/comment.xml                     | 12 ------
 .../variables/error_message.xml               | 12 ------
 .../variables/history.xml                     | 12 ------
 .../variables/time.xml                        | 12 ------
 .../immobilisation_workflow/worklists.xml     | 12 ------
 bt5/erp5_immobilisation/bt/change_log         |  3 ++
 bt5/erp5_immobilisation/bt/revision           |  2 +-
 415 files changed, 929 insertions(+), 6557 deletions(-)

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 7cb815de09..0400af7ea6 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/select_items_to_build_amortisation_transactions.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/select_items_to_build_amortisation_transactions.xml
index d8c5f31c49..a175ae8c77 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/select_items_to_build_amortisation_transactions.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/select_items_to_build_amortisation_transactions.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
index 6f8def5339..4c5456bc6d 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/history.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
index 9bcfc78687..5b2798f4e2 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/metadata.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
index f871a92fc4..48db676274 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/print.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
index 97da81ac4e..4d916ec8e1 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Rule/view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 16b38d9900..b68c21b083 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 44fa3649b9..cd1055bd79 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 f871a92fc4..48db676274 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 c7e4311b26..5fce0b836c 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 9d1bba910c..2761e418c0 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 003bd1112a..e135cdaef3 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/details.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 16b38d9900..b68c21b083 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/history.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 5b08bbb5bc..6b7bc18c89 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 83dd28499f..6bf030780a 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/metadata.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 609ad84fc0..8dc9ebe80b 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/print.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 c01919233d..d0c4cf34f5 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Amortisation%20Transaction/view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -46,10 +37,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>
@@ -76,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -46,10 +37,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>
@@ -76,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -46,10 +37,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>
@@ -76,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -46,10 +37,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>
@@ -76,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -46,10 +37,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>
@@ -76,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -95,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..ad843c16ba 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/history.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..49752ad751 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/metadata.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..deec4a8484 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/print.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..17304cde28 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Line/view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..c8b5be122d 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..d4cd9edd27 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/print.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..69d3cd7595 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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..dc7f46e720 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation%20Module/view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -44,10 +35,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>
@@ -74,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
index d7d5171eeb..f39f4fd0d1 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/history.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 15addef944..ef1da4ea88 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
index e162289632..f60514c40e 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/metadata.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
index a1393d8768..d4cd9edd27 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/print.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
index 2355f448ab..f16e52f441 100644
--- a/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
+++ b/bt5/erp5_immobilisation/ActionTemplateItem/portal_types/Immobilisation/view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -70,11 +61,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 99f0e269f8..59e5f182bc 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 f76dff6198..f61fcacb2c 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 3cf26c1a6e..294abdbf97 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 d05a6b1ef7..106a4c8691 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 f2d1ce18a2..e64999bbb0 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 64106f34ad..5fa6bee559 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 15addef944..ef1da4ea88 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 ad86b31ba0..754e2d4e14 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 ec5e29f59d..4b540e2615 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 99f0e269f8..59e5f182bc 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 76593988ef..22f0f3ec13 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 8de797fc63..8542e9ecec 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 023a89b3ed..2afb5237aa 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 6ec2ade39c..ec786945db 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 4cf204f231..ae3fa7ec37 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
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 36e1f9fcd3..540727e5b2 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
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
@@ -72,11 +63,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +79,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
index 2a2df36ee4..a9e419ca14 100644
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_arg</string> </key>
             <value>
@@ -61,12 +52,6 @@
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
             <value>
@@ -128,9 +113,11 @@ AND <dtml-var table_0>.uid = catalog.uid\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
index 04d742bda3..c5fab97b52 100644
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_arg</string> </key>
             <value>
@@ -45,7 +36,7 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>table_0</string>
+                            <string>table_0</string>
                           </list>
                         </value>
                     </item>
@@ -54,12 +45,6 @@
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
             <value>
@@ -119,9 +104,11 @@
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
index 7a4ef06853..dbaa3d6d89 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -142,12 +127,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..a40c030057 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -142,12 +127,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..855602f127 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -145,12 +130,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..b7d504fe19 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -142,12 +127,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..4b924e69c9 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -144,12 +129,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..e9f0b832dd 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -142,12 +127,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..e392ae8e8b 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -145,12 +130,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</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..8504594c15 100644
--- a/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml
+++ b/bt5/erp5_immobilisation/CategoryTemplateItem/portal_categories/output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Tool.Category</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5.Tool.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -142,12 +127,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule.xml b/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule.xml
index 6c8d54a90f..7485a7da3b 100644
--- a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule.xml
+++ b/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule.xml
@@ -9,36 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_Add_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Delete_objects_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Modify_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -57,12 +27,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_range_criterion</string> </key>
             <value>
@@ -107,12 +71,6 @@
             <key> <string>title</string> </key>
             <value> <string>Default Amortisation Rule</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>version</string> </key>
             <value> <string>1</string> </value>
diff --git a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/default_quantity_tester.xml b/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/default_quantity_tester.xml
index d523d42413..36e1cc2d8e 100644
--- a/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/default_quantity_tester.xml
+++ b/bt5/erp5_immobilisation/PathTemplateItem/portal_rules/default_amortisation_rule/default_quantity_tester.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.QuantityDivergenceTester</string>
-          <string>QuantityDivergenceTester</string>
-        </tuple>
-        <none/>
+        <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -30,12 +21,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>
@@ -81,12 +66,6 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Rule.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Rule.xml
index 5effcb9f16..e03afe0e49 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Rule.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Rule.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction%20Line.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction%20Line.xml
index 21d3188245..4362e361fe 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction%20Line.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction%20Line.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
@@ -30,12 +21,6 @@
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_property_domain_dict</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction.xml
index beac65dfe6..b33671bb46 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Amortisation%20Transaction.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
@@ -30,12 +21,6 @@
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
index c123b3e4cb..fdc0017682 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Line.xml
@@ -3,33 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Module.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Module.xml
index 8183a76252..d14197a678 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Module.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation%20Module.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
@@ -30,12 +21,6 @@
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
index dc5836a8d5..a2a6242385 100644
--- a/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
+++ b/bt5/erp5_immobilisation/PortalTypeTemplateItem/portal_types/Immobilisation.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_actions</string> </key>
             <value>
@@ -30,12 +21,6 @@
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu.xml
index 1aab9f9207..bc45258f7f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu.xml
@@ -3,33 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>erp5_accounting_eu</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails.xml
index b943496542..db90d4d41d 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -80,7 +65,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_input_account</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_duration.xml
index 214f79e0f5..63955cd0d7 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_start_price.xml
index 6689d0402e..826e45f99c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_disposal_price.xml
index 5d2c76c720..5ae9ccf5e6 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_account.xml
index d6f97f44c0..c0b13d1500 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_price.xml
index b6687bf513..eb2661b77a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_extra_cost_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat.xml
index d2a259d772..ed0a283a5b 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
index 8a61cf5c4d..1c25c47a15 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_monthly_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
index daac82b3c0..dab7f68b04 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_monthly_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euLinearAmortisationMethodViewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails.xml
index f58e03f7ca..f9fa8c6e21 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -80,7 +65,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_input_account</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_account.xml
index d6f97f44c0..c0b13d1500 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_price.xml
index e844ca8c5d..9bbedf8ec2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_extra_cost_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat.xml
index af3a84ac08..cc8e9079c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
index 8a61cf5c4d..1c25c47a15 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_monthly_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
index daac82b3c0..dab7f68b04 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_monthly_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/Immobilisation_euNoAmortisationAmortisationMethodViewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
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 684a6b477e..f2aa849361 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 67d8a5b594..4ff55f5c2f 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear.xml
index 85594c8cf9..8680e35f8a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/linear.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -101,12 +92,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>continuous</string> </key>
             <value> <int>1</int> </value>
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 5fcb4f46e3..62e3c389d3 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -79,18 +64,6 @@ return None\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>initial_remaining_annuities=None, start_remaining_annuities=None, stop_remaining_annuities=None, current_annuity=None, start_remaining_durability=None, stop_remaining_durability=None, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation.xml
index add26ad3ce..ab08bcc98d 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_eu/no_amortisation.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -101,12 +92,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>continuous</string> </key>
             <value> <int>0</int> </value>
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 ebfd5c7295..465530277d 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -79,18 +64,6 @@ return None\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>initial_remaining_annuities=None, start_remaining_annuities=None, stop_remaining_annuities=None, current_annuity=None, start_remaining_durability=None, stop_remaining_durability=None, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr.xml
index cbdefee942..579b065df7 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr.xml
@@ -3,33 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>erp5_accounting_fr</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails.xml
index 07aadc588d..9b54db9a02 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -80,7 +65,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_input_account</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_durability.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_durability.xml
index f43add8aa6..a22b114a97 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_durability.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_durability.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_durability</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_account.xml
index d6f97f44c0..c0b13d1500 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_price.xml
index e844ca8c5d..9bbedf8ec2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_extra_cost_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat.xml
index af3a84ac08..cc8e9079c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
index 8a61cf5c4d..1c25c47a15 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_monthly_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
index daac82b3c0..dab7f68b04 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_monthly_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frActualUseAmortisationMethodViewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails.xml
index 890aa7b518..bb4579725e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -80,7 +65,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_input_account</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
index 3b2bc988c0..8f4dae748c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_degressive_coefficient</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
index d6f97f44c0..c0b13d1500 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
index e844ca8c5d..9bbedf8ec2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
index af3a84ac08..cc8e9079c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
index 8a61cf5c4d..1c25c47a15 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
index daac82b3c0..dab7f68b04 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_monthly_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frDegressiveAmortisationMethodViewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails.xml
index d209c42b36..218262bdb2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -80,7 +65,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_input_account</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
index 3b2bc988c0..8f4dae748c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_degressive_coefficient.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_degressive_coefficient</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
index d6f97f44c0..c0b13d1500 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
index e844ca8c5d..9bbedf8ec2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_extra_cost_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_extra_cost_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
index af3a84ac08..cc8e9079c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
index 8a61cf5c4d..1c25c47a15 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_immobilisation_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
index daac82b3c0..dab7f68b04 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_monthly_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_monthly_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/Immobilisation_frUncontinuousDegressiveAmortisationMethodViewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
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 82d346a603..31fa92653e 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 b81e77f65d..116a70dfce 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 7206cc7dff..df8fc9e55a 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use.xml
index 002d621a52..dd8a7c3361 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -101,12 +92,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>continuous</string> </key>
             <value> <int>1</int> </value>
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 d7a9f96749..371f62f6ae 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -94,18 +79,6 @@ except ZeroDivisionError:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>initial_remaining_annuities=None, start_remaining_annuities=None, stop_remaining_annuities=None, current_annuity=None, start_remaining_durability=None, stop_remaining_durability=None, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails.xml
index 3ece9e7c46..dd1a0bfd9e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_duration.xml
index e904694752..a08320d055 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_price.xml
index bcd749a22c..39c6c8f9d3 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_amortisation_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_amortisation_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_durability.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_durability.xml
index 4013478f5e..a40e287398 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_durability.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_default_durability.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_durability</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_durability.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_durability.xml
index 3566648add..2682b96f2c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_durability.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_durability.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_durability</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_id.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_id.xml
index 966dc73b6c..56358b64ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_id.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_id.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_id</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation.xml
index 3fd74adfd5..efb8872b2e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>CheckBoxField</string>
-        </tuple>
-        <none/>
+        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_stop_date.xml
index 98cbf3d3e2..beb78ce3ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_stop_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_stop_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_stop_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat.xml
index 6e603ad842..b3426480a0 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat_account.xml
index 5d79bb6498..0b4de907a2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/my_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/validity.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/validity.xml
index cbeace1e59..6159247176 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/validity.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/actual_use_Immobilisation_viewDetails/validity.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>validity</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive.xml
index 26ef418088..2b91fd00a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -111,12 +102,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>continuous</string> </key>
             <value> <int>1</int> </value>
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 fcc0a96505..4c617aa9f7 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -103,18 +88,6 @@ except IndexError:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>initial_remaining_annuities=None, start_remaining_annuities=None, stop_remaining_annuities=None, current_annuity=None, start_remaining_durability=None, stop_remaining_durability=None, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails.xml
index 97343c144b..dcec1a8f01 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_account.xml
index 409554cd0a..41bfa57f42 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_duration.xml
index 1daeffc2fd..c4395c33a1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_start_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_start_price.xml
index b4b0b1e00c..f8d55b8472 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_start_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_amortisation_start_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_start_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_duration.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_duration.xml
index e904694752..a08320d055 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_duration.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_duration.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_amortisation_duration</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_price.xml
index bcd749a22c..39c6c8f9d3 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_amortisation_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_amortisation_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_durability.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_durability.xml
index 4013478f5e..a40e287398 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_durability.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_default_durability.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_default_durability</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_degressive_coefficient.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_degressive_coefficient.xml
index 5539085cda..ee0cf9fa8f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_degressive_coefficient.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_degressive_coefficient.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_degressive_coefficient</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_depreciation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_depreciation_account.xml
index c84fa1b292..bfd1909bed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_depreciation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_depreciation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_depreciation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_disposal_price.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_disposal_price.xml
index 3e5257b4ca..b1c6d09e0a 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_disposal_price.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_disposal_price.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_disposal_price</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_durability.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_durability.xml
index 3566648add..2682b96f2c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_durability.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_durability.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_durability</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_id.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_id.xml
index 966dc73b6c..56358b64ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_id.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_id.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_id</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation.xml
index 3fd74adfd5..efb8872b2e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>CheckBoxField</string>
-        </tuple>
-        <none/>
+        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation_account.xml
index ec35411595..90ec29773c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_immobilisation_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_immobilisation_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_input_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_input_account.xml
index 8b7df22e52..1d07c2b0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_input_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_input_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_input_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_output_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_output_account.xml
index 11c0aa395a..1f63881337 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_output_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_output_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_output_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_stop_date.xml
index 98cbf3d3e2..beb78ce3ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_stop_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_stop_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_stop_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat.xml
index 6e603ad842..b3426480a0 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_vat</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat_account.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat_account.xml
index 5d79bb6498..0b4de907a2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat_account.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/my_vat_account.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_vat_account</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/validity.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/validity.xml
index cbeace1e59..6159247176 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/validity.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/degressive_Immobilisation_viewDetails/validity.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>validity</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive.xml
index faa9a34c09..9e87258f27 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_accounting_fr/uncontinuous_degressive.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -111,12 +102,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>continuous</string> </key>
             <value> <int>0</int> </value>
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 4d582055cf..7640aec38c 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -103,18 +88,6 @@ except IndexError:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>initial_remaining_annuities=None, start_remaining_annuities=None, stop_remaining_annuities=None, current_annuity=None, start_remaining_durability=None, stop_remaining_durability=None, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation.xml
index cf9f8ff275..4858878342 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation.xml
@@ -3,33 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>erp5_immobilisation</string> </value>
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 0ee0178fee..7b3cdb1fb5 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -89,18 +74,6 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>item_uid_list=[], at_date=None</string> </value>
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 a67856f988..c3f02320aa 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -101,18 +86,6 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>selection_name=None,uids=None,listbox_uid=(),form_id=None,cancel_url=\'\',**kw</string> </value>
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 bc5b7085ae..c7dcceda8c 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -100,18 +85,6 @@ context.portal_deliveries.amortisation_transaction_builder.build(**builder_kw)\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>at_date=None, item_uid_list=[]</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
index fba0e62bbb..4506a43db0 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>AccountingTransactionModule_activateBuildAmortisationTransaction</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/item_title_list.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/item_title_list.xml
index 798d9586ea..4ae5cdc201 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/item_title_list.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/item_title_list.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>item_title_list</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_at_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_at_date.xml
index b597193630..b093a21b81 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_at_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_at_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_at_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_item_uid_list.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_item_uid_list.xml
index 27f333062f..1188f6798b 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_item_uid_list.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionDialog/my_item_uid_list.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_item_uid_list</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
index 5def64c516..fe04fec430 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog/listbox.xml
index 623583b6ff..ba62883447 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AccountingTransactionModule_buildAmortisationTransactionSelectItemListDialog/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationRule_asPredicate.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationRule_asPredicate.xml
index 283f74bd2b..e4271ca1ee 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationRule_asPredicate.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationRule_asPredicate.xml
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -74,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationSystem_addAmortisationMethod.xml
index d3eb46af05..7aaed626e5 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -133,18 +118,6 @@ return printed\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>amortisation_method=None</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view.xml
index fa6f23da6a..4ba5037e75 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_destination_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_destination_title.xml
index 7fae71b4ef..b22a4c286c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_destination_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_destination_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_resource.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_resource.xml
index d4ca05f811..9173728ebf 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_resource.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_resource.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_resource</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_credit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_credit.xml
index e2f7514de4..39360f3a95 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_credit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_credit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_credit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_debit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_debit.xml
index 7c5bb7e5aa..b3f6571d66 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_debit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_debit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_debit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_title.xml
index cade261cb3..fe386c6da6 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransactionLine_view/my_source_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_title</string> </value>
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 bca9ccb72e..b117f4ca8c 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -74,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
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 4bf3f1e2ad..e6568e2d6e 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -109,18 +97,6 @@ if context.getSimulationState() in context.getPortalUpdatableAmortisationTransac
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_doSolveActions.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_doSolveActions.xml
index 3f0096b9c6..8a51a8022e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_doSolveActions.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_doSolveActions.xml
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -120,12 +108,6 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url )\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>form_id, dialog_id=\'\', **kw</string> </value>
@@ -201,12 +183,6 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url )\n
             <key> <string>id</string> </key>
             <value> <string>AmortisationTransaction_doSolveActions</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
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 aca76fce7a..baf91008e3 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -94,18 +79,6 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_pdf_template.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_pdf_template.xml
index 73a7b5598c..e273aeab5f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_pdf_template.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_pdf_template.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -44,12 +35,6 @@
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
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 b0d6f1912b..5b99c27222 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -84,18 +69,6 @@ return return_list\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>movement_list=None</string> </value>
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 66b571ce22..7f270ea987 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -89,18 +74,6 @@ else:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>src__=0, **kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view.xml
index 0c097d904b..9e0f312fba 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox.xml
index b4423cf412..affdc7a92b 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_destination.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_destination.xml
index 430e6aa8ac..e069c83dee 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_destination.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_destination.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_destination</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source.xml
index d0d591b3e0..5460fc5ece 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_credit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_credit.xml
index 90c0463a75..7959b71d23 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_credit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_credit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source_credit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_debit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_debit.xml
index 61a23914b4..3047eed569 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_debit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_source_debit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source_debit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_title.xml
index 4718317975..2d9a819b69 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/listbox_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_description.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_description.xml
index 092623c94e..40c01fcb3c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_description.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_description.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_description</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_reference.xml
index 38c854ada6..c7951c0db8 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_section_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_section_title.xml
index 1005019461..be20610447 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_section_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_destination_section_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_section_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_reference.xml
index 5b61786f43..2de00f0972 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_resource.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_resource.xml
index ab0ba54bc1..37c0405ca9 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_resource.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_resource.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_resource</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_reference.xml
index b82c7a6beb..5d9c65a1ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_section.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_section.xml
index 475e515dc3..75ad948784 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_section.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_source_section.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_section</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_start_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_start_date.xml
index d6a85b5fbe..508ad986c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_start_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_start_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_start_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_title.xml
index 852400c99b..81fe6037ed 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/my_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/simulation_state.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/simulation_state.xml
index 2d07947361..9f63cc600c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/simulation_state.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_view/simulation_state.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>simulation_state</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewAsPDF.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewAsPDF.xml
index 496bcad3f5..e3291193a4 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewAsPDF.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewAsPDF.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.PDFTemplate</string>
-          <string>PDFTemplate</string>
-        </tuple>
-        <none/>
+        <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -44,12 +35,6 @@
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails.xml
index ea446f0157..6c93d45f63 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox.xml
index 216b29d6e2..bf570c4b05 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_destination.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_destination.xml
index 24c36bcf26..7a641aee22 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_destination.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_destination.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_destination</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source.xml
index d0d591b3e0..5460fc5ece 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_credit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_credit.xml
index 90c0463a75..7959b71d23 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_credit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_credit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source_credit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_debit.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_debit.xml
index 61a23914b4..3047eed569 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_debit.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_source_debit.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_source_debit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_title.xml
index d6dd2359ef..3e6279cc48 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/listbox_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_description.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_description.xml
index 092623c94e..40c01fcb3c 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_description.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_description.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_description</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_reference.xml
index 3ba54e10be..7b5bae4a1e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_section_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_section_title.xml
index 885e10bdc5..ae35d22493 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_section_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_destination_section_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.RelationField</string>
-          <string>RelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_destination_section_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_reference.xml
index e17a9bdf5d..ee5f1bba17 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_resource.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_resource.xml
index ab0ba54bc1..37c0405ca9 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_resource.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_resource.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_resource</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_reference.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_reference.xml
index b82c7a6beb..5d9c65a1ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_reference.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_reference.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_reference</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_section.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_section.xml
index 475e515dc3..75ad948784 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_section.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_source_section.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_section</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_start_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_start_date.xml
index 44efe45eb4..122f36ea93 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_start_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_start_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_start_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_stop_date.xml
index 1485cf6562..4852170fad 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_stop_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_stop_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_stop_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_title.xml
index 33ab0e6770..e9c762b2ae 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/my_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/simulation_state.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/simulation_state.xml
index 9c65ee4042..67239c705e 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/simulation_state.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewDetails/simulation_state.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>simulation_state</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog.xml
index 1d374a968c..653a092240 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox.xml
index 0f350d5d4a..606300f0ab 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_choice.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_choice.xml
index 6c76c8a81a..570e942184 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_choice.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_choice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_quantity.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_quantity.xml
index dda4d68e6a..f421a97fbd 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_quantity.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_viewSolveActionsDialog/listbox_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
index 36440e77e0..80b8e4ed9f 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_arg</string> </key>
             <value>
@@ -62,9 +53,9 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>from_table_list</string>
-<string>where_expression</string>
-<string>order_by_expression</string>
+                            <string>from_table_list</string>
+                            <string>where_expression</string>
+                            <string>order_by_expression</string>
                           </list>
                         </value>
                     </item>
@@ -73,12 +64,6 @@
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
             <value>
@@ -165,9 +150,11 @@ ORDER BY <dtml-var order_by_expression>\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
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 5c8a78da64..a43296fa0f 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -98,18 +83,6 @@ return price\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
@@ -149,6 +122,7 @@ return price\n
                             <string>item_list</string>
                             <string>_getiter_</string>
                             <string>line</string>
+                            <string>_inplacevar_</string>
                             <string>price</string>
                             <string>item</string>
                             <string>_apply_</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
index 5b6a4cb608..e392601162 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationDelivery_expandAggregatedItems.xml
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -84,18 +72,6 @@ for item in item_list:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view.xml
index eaa75bad0d..2d0c8c272b 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_aggregate_title_list.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_aggregate_title_list.xml
index 70bfac871c..23125c8e76 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_aggregate_title_list.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.MultiRelationField</string>
-          <string>MultiRelationStringField</string>
-        </tuple>
-        <none/>
+        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_aggregate_title_list</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
index 2084d5ea1f..d1423db693 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_amortisation_method.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_amortisation_method</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_description.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_description.xml
index 654c272720..c3b8b71670 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_description.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_description.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_description</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_title.xml
index 531e2bbab6..6b82ce9ff2 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationLine_view/my_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList.xml
index d7f6e048ce..841eb6f46d 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_doSelect</string> </value>
@@ -77,7 +62,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -85,7 +70,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_delivery_stop_date</string>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox.xml
index 633411c119..593f4b412d 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox_delivery_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox_delivery_stop_date.xml
index cfb4790d57..2f37763edb 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox_delivery_stop_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/ImmobilisationModule_viewImmobilisationList/listbox_delivery_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -423,28 +420,28 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Default</string> </key>
+                    <key> <string>Default</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>date</string> </key>
+                    <key> <string>date</string> </key>
                     <value>
                       <list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+                        <string>year</string>
+                        <string>month</string>
+                        <string>day</string>
                       </list>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>time</string> </key>
+                    <key> <string>time</string> </key>
                     <value>
                       <list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+                        <string>hour</string>
+                        <string>minute</string>
+                        <string>ampm</string>
                       </list>
                     </value>
                 </item>
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 f460407f27..3b5b66bfec 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -98,18 +83,6 @@ return [(\'\',\'\')] + getList()\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 4637ee0eb7..890bbd9bf3 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -90,18 +75,6 @@ return [(context.Base_translateString(\'Default Amortisation Data\'),\'\')] + re
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 239a56fdad..89453ef321 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -93,18 +78,6 @@ return return_list\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 5c241a9a39..f45137e1c2 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -127,18 +112,6 @@ return returned_value\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>transaction_line=None</string> </value>
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 ab2b23dec5..108839cde9 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -101,18 +89,6 @@ return translated_list\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
@@ -173,12 +149,6 @@ return translated_list\n
             <key> <string>id</string> </key>
             <value> <string>Immobilisation_getValidityErrorTranslatedList</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
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 d28abd7912..a12837b83e 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +62,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 4632d44731..0c24900297 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -81,18 +66,6 @@ return 1\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml
index 15ab737c14..d73b68feef 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/listbox.xml
index e807b1ed8b..612cecbc06 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_comment.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_comment.xml
index 4febe61ffb..70ba5a8f55 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_comment.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_comment.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_comment</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml
index 2ce8b49c97..9a8e48cc95 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_stop_date</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml
index 2791861df6..1acf1158c1 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml
index ccc8810038..1f5da982b9 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_translated_immobilisation_state_title</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors.xml
index 1fe4c596e9..5287282c68 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors/validity_errors.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors/validity_errors.xml
index 7e419d7bbd..e00f2ca051 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors/validity_errors.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_viewValidityErrors/validity_errors.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>LinesField</string>
-        </tuple>
-        <none/>
+        <global name="LinesField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>validity_errors</string> </value>
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 e9a29c01db..a5da150c47 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -94,18 +79,6 @@ return immo_object_list\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>return_errors=0, **kw</string> </value>
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 14782787ba..3fcfc0c538 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -92,18 +77,6 @@ return context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods.xml
index bef44a7449..f27b7d6a29 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -45,12 +36,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
index b78a162db8..c524297455 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/errors.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>errors</string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/listbox.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/listbox.xml
index 537da551fb..0baeb722d0 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/listbox.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Item_viewImmobilisationPeriods/listbox.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
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 37b207512c..07087e200c 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -103,18 +88,6 @@ return printed\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 2a914dcec4..1914041cb6 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -120,18 +105,6 @@ return printed\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 3016d1a1ce..4c6634998a 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
@@ -3,31 +3,16 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -111,18 +96,6 @@ return printed\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
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 60b09e9be0..b90ec098e3 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
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
@@ -61,12 +49,6 @@
             <key> <string>title</string> </key>
             <value> <string>Causality workflow</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
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 2a1210abc6..0622b3c34f 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
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </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 9e1ec89722..36ff8e5636 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -85,18 +73,6 @@ transaction.activate().updateCausalityState()\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
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 d2131f266f..ff7e174d7c 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -75,18 +63,6 @@ context.activate().updateCausalityState()\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change,**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states.xml
index 27e6164895..a21bb6e959 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>states</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/building.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/building.xml
index 5319a2bae4..fff3699cc6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/building.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/building.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/calculating.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/calculating.xml
index 2bf82d6ee2..ffdefd0588 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/calculating.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/calculating.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/diverged.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/diverged.xml
index 0b6166a7b6..2a9308162f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/diverged.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/diverged.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/draft.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/draft.xml
index 4d25422b5e..d3a37bce1e 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/draft.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/draft.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solved.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solved.xml
index d6387ad16c..267145c4e5 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solved.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solved.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solving.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solving.xml
index 41ffed0135..599e08267d 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solving.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/states/solving.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions.xml
index 7cea684cde..092a5b48f6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>transitions</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision.xml
index 4a73ac3cc6..e9526124c3 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision_action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision_action.xml
index c43187e342..47375af87f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision_action.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/accept_decision_action.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision.xml
index 9fa1dafb4c..5517f05be5 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision_action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision_action.xml
index 81fc930466..01521ae104 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision_action.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/adopt_prevision_action.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/calculate.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/calculate.xml
index 0fcfec2091..1a6c70adcf 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/calculate.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/calculate.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/converge.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/converge.xml
index 46aefc503d..6634683900 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/converge.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/converge.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/diverge.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/diverge.xml
index 4a64657137..df43546d65 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/diverge.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/diverge.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/start_building.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/start_building.xml
index 2dff63ba83..375df34705 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/start_building.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/transitions/start_building.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables.xml
index d328fb0f3e..a067e6fbbe 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/action.xml
index 479ba4ac41..ed306eb6af 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/action.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/action.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml
index c2f7773a7f..d2b89d6051 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/comment.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/comment.xml
index 8063cd249a..999beb2edb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/comment.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/comment.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/history.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/history.xml
index 8fe02f5202..d7bca55728 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/history.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/history.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/portal_type.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/portal_type.xml
index af61062944..a874ecc8bb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/portal_type.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/portal_type.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/start_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/start_date.xml
index 20083cf651..42febd0b78 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/start_date.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/start_date.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/stop_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/stop_date.xml
index 763fcfba8e..694a8354be 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/stop_date.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/stop_date.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/time.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/time.xml
index 7fd710a4fe..0364a3b135 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/time.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/time.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists.xml
index 69eb3b15ad..40787ac9e4 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists/diverged.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists/diverged.xml
index fdbc4be1e6..5c21a6f083 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists/diverged.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/worklists/diverged.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>global</string> </value>
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 56b00611ff..d921e9058e 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
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions.xml
index fb586f441d..6788072919 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>interactions</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_delete.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_delete.xml
index edf2ef693d..8d4b94e0fe 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_delete.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_delete.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_edit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_edit.xml
index 4bc11e459e..42f3f5c542 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_edit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransactionContent_edit.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransaction_delete.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransaction_delete.xml
index dc6705b76c..563c8130c0 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransaction_delete.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/interactions/AmortisationTransaction_delete.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts.xml
index 41c3b9019a..0622b3c34f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/scripts.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</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 b3059718d8..8dd5cdfb9f 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -77,18 +65,6 @@ if getattr(object.getRootDeliveryValue(), \'calculate\', None) is not None:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
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 28ea7b7e40..0466f81e80 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -78,18 +66,6 @@ for simulation_movement in line.getDeliveryRelatedValueList():\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
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 00e9fa2e73..16386aac8b 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -79,18 +67,6 @@ for line in delivery.getMovementList():\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/variables.xml
index c17570e7f7..5547232278 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/variables.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/variables.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/worklists.xml
index b0559b432a..1f8b17b012 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/worklists.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_interaction_workflow/worklists.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
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 019d247c1a..d32ceb0fec 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
@@ -55,12 +43,6 @@
             <key> <string>title</string> </key>
             <value> <string>Immobilisation Delivery Workflow</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
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 2a1210abc6..0622b3c34f 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
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
index 27e6164895..a21bb6e959 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>states</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
index 989d3b366a..fad490a5a6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/states/delivered.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
index 7cea684cde..092a5b48f6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/transitions.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>transitions</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
index d328fb0f3e..a067e6fbbe 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
index 479ba4ac41..ed306eb6af 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/action.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
index c2f7773a7f..d2b89d6051 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
index 8063cd249a..999beb2edb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/comment.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
index 8fe02f5202..d7bca55728 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/history.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
index af61062944..a874ecc8bb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/portal_type.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
index 20083cf651..42febd0b78 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/start_date.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
index 763fcfba8e..694a8354be 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/stop_date.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
index 7fd710a4fe..0364a3b135 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/time.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
@@ -53,12 +41,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>update_always</string> </key>
             <value> <int>1</int> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml
index 69eb3b15ad..40787ac9e4 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/worklists.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,22 +21,10 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
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 b1d1ae6dac..649499a80c 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
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions.xml
index fb586f441d..6788072919 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>interactions</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_edit.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_edit.xml
index cceace3e24..15aa7d7b14 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_edit.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_edit.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_expandAmortisation.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_expandAmortisation.xml
index 47e155a022..3e8cb286ef 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_expandAmortisation.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_expandAmortisation.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml
index dd9532447e..08fd005dbb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts.xml
index 41c3b9019a..0622b3c34f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
index a20ed724f9..2f47770a68 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/Immobilisation_updateFutureMovementsImmobilisationState.xml
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -81,18 +69,6 @@ pl.ImmobilisationDelivery_expandAggregatedItems()\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change, **kw</string> </value>
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 5991255cde..569831f12a 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -78,18 +66,6 @@ if getattr(movement, \'getImmobilisationState\', None) is not None and movement.
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_expandAmortisationOnAggregateValueList.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_expandAmortisationOnAggregateValueList.xml
index 08bfe7a864..d9a81fa9ed 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_expandAmortisationOnAggregateValueList.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/scripts/PackingList_expandAmortisationOnAggregateValueList.xml
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -75,18 +63,6 @@ pl.getRootDeliveryValue().ImmobilisationDelivery_expandAggregatedItems()\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/variables.xml
index c17570e7f7..5547232278 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/variables.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/variables.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/worklists.xml
index b0559b432a..1f8b17b012 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/worklists.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/worklists.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
               <dictionary/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
index 46aa67ac6d..fba3354e8b 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow.xml
@@ -9,24 +9,12 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>groups</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts.xml
index 41c3b9019a..0622b3c34f 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/scripts.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</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 5aeb9501d8..982897a609 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -81,18 +69,6 @@ pl.activate(after_method_id=(\'recursiveReindexObject\', \'immediateReindexObjec
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change,**kw</string> </value>
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 a4c294f474..084181c9fd 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
@@ -9,22 +9,10 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -78,18 +66,6 @@ for movement in pl.getAggregatedItemsNextImmobilisationMovementValueList():\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>state_change,**kw</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states.xml
index 26c46d417e..a21bb6e959 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>states</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/calculating.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/calculating.xml
index 9da07c8040..4a44461450 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/calculating.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/calculating.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/invalid.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/invalid.xml
index 319fa88f7a..7aa84c7a70 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/invalid.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/invalid.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/valid.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/valid.xml
index 3e1ef30b31..f54a05c670 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/valid.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/states/valid.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions.xml
index 7e4e3b0184..092a5b48f6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>transitions</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/calculate_immobilisation_validity.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/calculate_immobilisation_validity.xml
index 0c5a872400..7a42b0c9b1 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/calculate_immobilisation_validity.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/calculate_immobilisation_validity.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/invalidate_immobilisation.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/invalidate_immobilisation.xml
index 8a58a0de7a..d1ad967cc4 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/invalidate_immobilisation.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/invalidate_immobilisation.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/validate_immobilisation.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/validate_immobilisation.xml
index ce4e51e881..1e1149b9f6 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/validate_immobilisation.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/transitions/validate_immobilisation.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables.xml
index 2b275991f8..a067e6fbbe 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/action.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/action.xml
index 211f6e7302..ed306eb6af 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/action.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/action.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml
index 2c1925cf9a..d2b89d6051 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/comment.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/comment.xml
index 5d4243e7fa..999beb2edb 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/comment.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/comment.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/error_message.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/error_message.xml
index ea1ffb9595..e89715783d 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/error_message.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/error_message.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/history.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/history.xml
index 717ebffc4a..d7bca55728 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/history.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/history.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/time.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/time.xml
index 587bdc630c..0364a3b135 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/time.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/time.xml
@@ -9,18 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>default_expr</string> </key>
             <value>
diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/worklists.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/worklists.xml
index cee05b5813..40787ac9e4 100644
--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/worklists.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/worklists.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_mapping</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
diff --git a/bt5/erp5_immobilisation/bt/change_log b/bt5/erp5_immobilisation/bt/change_log
index c92e1dc0f6..8cde7febd0 100644
--- a/bt5/erp5_immobilisation/bt/change_log
+++ b/bt5/erp5_immobilisation/bt/change_log
@@ -1,3 +1,6 @@
+2008-10-8 yusei
+* Update xml format.
+
 2008-09-16 Kazuhiko
 * revise amortisation_transaction_builder using new API.
 
diff --git a/bt5/erp5_immobilisation/bt/revision b/bt5/erp5_immobilisation/bt/revision
index 4701cc7931..c663e4d093 100644
--- a/bt5/erp5_immobilisation/bt/revision
+++ b/bt5/erp5_immobilisation/bt/revision
@@ -1 +1 @@
-150
\ No newline at end of file
+151
\ No newline at end of file
-- 
2.30.9