From 6d52e56e914a7359b4f6d9da220b73f878e01ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 28 Sep 2010 07:52:13 +0000
Subject: [PATCH] xml changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38699 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Budget%20Cell/view.xml       |  10 +-
 .../Budget%20Line/available_view.xml          |  10 +-
 .../Budget%20Line/consumed_view.xml           |  10 +-
 .../Budget%20Line/current_view.xml            |  10 +-
 .../Budget%20Line/engaged_view.xml            |  10 +-
 .../Budget%20Line/initial_view.xml            |  10 +-
 .../update_summary_budget_cell.xml            |  10 +-
 .../Budget%20Model%20Module/view.xml          |  10 +-
 .../portal_types/Budget%20Model/view.xml      |  10 +-
 .../budget_group_consumption_export.xml       |  15 +-
 .../budget_group_consumption_report.xml       |  10 +-
 .../portal_types/Budget%20Module/view.xml     |  10 +-
 .../Budget%20Transaction%20Module/view.xml    |  10 +-
 .../Budget%20Transaction/view.xml             |  10 +-
 .../Budget%20Transfer%20Line/view.xml         |  10 +-
 .../portal_types/Budget%20Transfer/view.xml   |  10 +-
 .../budget_group_consumption_export.xml       |  15 +-
 .../budget_group_consumption_report.xml       |  10 +-
 .../portal_types/Budget/original_budget.xml   |  10 +-
 .../Budget/transfer_line_list_view.xml        |  10 +-
 .../portal_types/Budget/view.xml              |  10 +-
 .../Category%20Budget%20Variation/view.xml    |  10 +-
 .../Node%20Budget%20Variation/view.xml        |  10 +-
 .../portal_categories/budget_line_type.xml    |   5 +-
 .../portal_categories/budget_section.xml      |   5 +-
 .../portal_categories/budget_variation.xml    |   5 +-
 .../portal_categories/inventory_axis.xml      |   5 +-
 .../budget_transaction_module.xml             | 620 ------------------
 .../budget_variation/budget.xml               |   5 +-
 .../budget_variation/budget_cell.xml          |   5 +-
 .../budget_variation/budget_line.xml          |   5 +-
 .../inventory_axis/function.xml               |   5 +-
 .../inventory_axis/function_category.xml      |   5 +-
 .../inventory_axis/mirror_node.xml            |   5 +-
 .../inventory_axis/mirror_node_category.xml   |   5 +-
 ...mirror_node_category_strict_membership.xml |   5 +-
 .../inventory_axis/mirror_section.xml         |   5 +-
 .../mirror_section_category.xml               |   5 +-
 ...ror_section_category_strict_membership.xml |   5 +-
 .../inventory_axis/movement.xml               |   5 +-
 .../movement_strict_membership.xml            |   5 +-
 .../portal_categories/inventory_axis/node.xml |   5 +-
 .../inventory_axis/node_category.xml          |   5 +-
 .../node_category_strict_membership.xml       |   5 +-
 .../inventory_axis/payment.xml                |   5 +-
 .../inventory_axis/payment_category.xml       |   5 +-
 .../inventory_axis/project.xml                |   5 +-
 .../inventory_axis/section.xml                |   5 +-
 .../inventory_axis/section_category.xml       |   5 +-
 .../section_category_strict_membership.xml    |   5 +-
 .../portal_skins/erp5_budget.xml              |   5 +-
 ...ntingTransactionLine_getBudgetCellList.xml |   5 +-
 .../erp5_budget/BudgetCell_asPredicate.xml    |   5 +-
 .../erp5_budget/BudgetCell_asTitle.xml        |   5 +-
 .../BudgetCell_getConsumedBudget.xml          |   5 +-
 .../BudgetCell_getEngagedBudget.xml           |   5 +-
 .../erp5_budget/BudgetCell_view.xml           |   5 +-
 .../BudgetCell_view/my_available_budget.xml   |  10 +-
 .../BudgetCell_view/my_consumed_budget.xml    |  10 +-
 .../BudgetCell_view/my_engaged_budget.xml     |  10 +-
 .../BudgetCell_view/my_quantity.xml           |   5 +-
 .../erp5_budget/BudgetCell_view/my_title.xml  |   5 +-
 .../erp5_budget/BudgetLine_asCellRange.xml    |   5 +-
 .../erp5_budget/BudgetLine_asPredicate.xml    |   5 +-
 .../erp5_budget/BudgetLine_getAccountList.xml |   5 +-
 .../BudgetLine_getAvailableBudgetCell.xml     |   5 +-
 .../BudgetLine_getConsumedBudgetCell.xml      |   5 +-
 ...dgetLine_getConsumedBudgetMovementList.xml |   6 +-
 .../BudgetLine_getConsumptionSign.xml         |   5 +-
 .../BudgetLine_getEditablePropertyList.xml    |   5 +-
 .../BudgetLine_getEngagedBudgetCell.xml       |   5 +-
 ..._getFinancialSectionRelatedAccountList.xml |   5 +-
 ...Line_getInventoryQueryDictForCellIndex.xml |   5 +-
 .../BudgetLine_getSummaryCellIndexDict.xml    |   5 +-
 .../BudgetLine_getSummaryDimensionKeyDict.xml |   5 +-
 ...dgetLine_getVariationRangeCategoryList.xml |   5 +-
 .../BudgetLine_hashVariationCategoryList.xml  |   5 +-
 .../erp5_budget/BudgetLine_init.xml           |   5 +-
 ...udgetLine_setQuantityOnSummaryCellList.xml |   5 +-
 .../BudgetLine_statCreditPrice.xml            |   5 +-
 .../erp5_budget/BudgetLine_statDebitPrice.xml |   5 +-
 .../erp5_budget/BudgetLine_statTotalPrice.xml |   5 +-
 .../erp5_budget/BudgetLine_view.xml           |   5 +-
 .../mapped_value_property_list.xml            |   5 +-
 .../erp5_budget/BudgetLine_view/matrixbox.xml |   5 +-
 .../matrixbox_destination_credit.xml          |  10 +-
 .../matrixbox_destination_debit.xml           |  10 +-
 ...box_membership_criterion_category_list.xml |  10 +-
 .../BudgetLine_view/matrixbox_quantity.xml    |   5 +-
 ...embership_criterion_base_category_list.xml |   5 +-
 .../BudgetLine_view/my_budget_line_type.xml   |  10 +-
 .../BudgetLine_view/my_description.xml        |   5 +-
 .../BudgetLine_view/my_int_index.xml          |   5 +-
 .../erp5_budget/BudgetLine_view/my_title.xml  |   5 +-
 .../my_variation_category_list.xml            |  15 +-
 .../BudgetLine_viewAvailableBudget.xml        |   5 +-
 .../matrixbox.xml                             |   5 +-
 .../matrixbox_quantity.xml                    |  10 +-
 .../my_description.xml                        |   5 +-
 .../my_title.xml                              |   5 +-
 .../BudgetLine_viewConsumedBudget.xml         |   5 +-
 .../matrixbox.xml                             |   5 +-
 .../matrixbox_quantity.xml                    |  10 +-
 .../my_description.xml                        |   5 +-
 .../my_title.xml                              |   5 +-
 ...getLine_viewConsumedBudgetMovementList.xml |   5 +-
 .../listbox.xml                               |  20 +-
 .../listbox_credit.xml                        |   5 +-
 .../listbox_credit_price.xml                  |   5 +-
 .../listbox_date.xml                          |   5 +-
 .../listbox_debit.xml                         |   5 +-
 .../listbox_debit_price.xml                   |   5 +-
 .../listbox_running_total_price.xml           |   5 +-
 .../listbox_total_price.xml                   |   5 +-
 .../my_title.xml                              |   5 +-
 .../BudgetLine_viewCurrentBudget.xml          |   5 +-
 .../matrixbox.xml                             |   5 +-
 .../matrixbox_quantity.xml                    |  10 +-
 .../my_description.xml                        |   5 +-
 .../BudgetLine_viewCurrentBudget/my_title.xml |   5 +-
 .../BudgetLine_viewEngagedBudget.xml          |   5 +-
 .../matrixbox.xml                             |   5 +-
 .../matrixbox_quantity.xml                    |  10 +-
 .../my_description.xml                        |   5 +-
 .../BudgetLine_viewEngagedBudget/my_title.xml |   5 +-
 .../BudgetLine_viewFieldLibrary.xml           |   5 +-
 .../mapped_value_property_list.xml            |   5 +-
 .../BudgetLine_viewFieldLibrary/matrixbox.xml |  10 +-
 ...box_membership_criterion_category_list.xml |   5 +-
 .../matrixbox_quantity.xml                    |  20 +-
 ...embership_criterion_base_category_list.xml |  10 +-
 .../my_description.xml                        |   5 +-
 .../my_resource_title.xml                     |  10 +-
 .../BudgetLine_viewFieldLibrary/my_title.xml  |   5 +-
 ...viewSetQuantityOnSummaryCellListDialog.xml |   5 +-
 .../BudgetModelModule_viewBudgetModelList.xml |   5 +-
 .../listbox.xml                               |   5 +-
 .../erp5_budget/BudgetModel_view.xml          |   5 +-
 .../erp5_budget/BudgetModel_view/listbox.xml  |   5 +-
 .../BudgetModel_view/my_description.xml       |   5 +-
 .../erp5_budget/BudgetModel_view/my_title.xml |   5 +-
 .../my_translated_validation_state_title.xml  |   5 +-
 .../your_at_date.xml                          |   5 +-
 .../your_deferred_style.xml                   |   5 +-
 .../your_format.xml                           |  10 +-
 .../your_from_date.xml                        |   5 +-
 .../your_section_category.xml                 |  15 +-
 .../your_validation_state.xml                 |  20 +-
 .../BudgetModule_viewBudgetList.xml           |   5 +-
 .../BudgetModule_viewBudgetList/listbox.xml   |   5 +-
 ...listbox_predicate_start_date_range_max.xml |   5 +-
 ...listbox_predicate_start_date_range_min.xml |   5 +-
 ...actionModule_viewBudgetTransactionList.xml |   5 +-
 .../listbox.xml                               |   5 +-
 .../BudgetTransaction_getBudgetCellList.xml   |   5 +-
 .../erp5_budget/BudgetTransaction_init.xml    |   5 +-
 .../erp5_budget/BudgetTransaction_view.xml    |   5 +-
 .../BudgetTransaction_view/my_description.xml |   5 +-
 .../BudgetTransaction_view/my_destination.xml |   5 +-
 .../BudgetTransaction_view/my_quantity.xml    |   5 +-
 .../my_resource_title.xml                     |   5 +-
 .../BudgetTransaction_view/my_source.xml      |   5 +-
 .../BudgetTransaction_view/my_start_date.xml  |   5 +-
 .../my_translated_simulation_state_title.xml  |   5 +-
 .../erp5_budget/BudgetTransferLine_view.xml   |   5 +-
 .../my_description.xml                        |   5 +-
 .../my_destination.xml                        |   5 +-
 .../BudgetTransferLine_view/my_quantity.xml   |   5 +-
 .../my_resource_title.xml                     |   5 +-
 .../BudgetTransferLine_view/my_source.xml     |   5 +-
 .../erp5_budget/Budget_asPredicate.xml        |   5 +-
 .../Budget_getVariationRangeCategoryList.xml  |   5 +-
 .../Budget_hashVariationCategoryList.xml      |   5 +-
 .../portal_skins/erp5_budget/Budget_view.xml  |   5 +-
 .../erp5_budget/Budget_view/listbox.xml       |   5 +-
 .../Budget_view/my_budget_type.xml            |   5 +-
 .../Budget_view/my_description.xml            |   5 +-
 .../erp5_budget/Budget_view/my_reference.xml  |  10 +-
 .../Budget_view/my_resource_title.xml         |  10 +-
 .../Budget_view/my_specialise_title.xml       |   5 +-
 .../Budget_view/my_start_date_range_max.xml   |   5 +-
 .../Budget_view/my_start_date_range_min.xml   |   5 +-
 .../erp5_budget/Budget_view/my_title.xml      |   5 +-
 .../my_translated_validation_state_title.xml  |   5 +-
 .../my_variation_category_list.xml            |  15 +-
 .../erp5_budget/Budget_view/my_version.xml    |  10 +-
 .../Budget_viewBudgetConsumptionReport.xml    |   5 +-
 ...dget_viewBudgetConsumptionReportDialog.xml |   5 +-
 .../your_deferred_style.xml                   |   5 +-
 .../your_format.xml                           |  10 +-
 ...et_viewBudgetConsumptionReportTemplate.xml |   5 +-
 .../CategoryBudgetVariation_view.xml          |   5 +-
 .../my_budget_variation.xml                   |   5 +-
 .../my_int_index.xml                          |   5 +-
 .../my_inventory_axis.xml                     |   5 +-
 .../CategoryBudgetVariation_view/my_title.xml |   5 +-
 .../my_translated_portal_type.xml             |   5 +-
 .../my_variation_base_category.xml            |  10 +-
 .../erp5_budget/NodeBudgetVariation_view.xml  |   5 +-
 .../my_aggregate_title_list.xml               |  10 +-
 .../my_budget_variation.xml                   |   5 +-
 .../my_include_virtual_other_node.xml         |   5 +-
 .../NodeBudgetVariation_view/my_int_index.xml |   5 +-
 .../my_inventory_axis.xml                     |   5 +-
 .../my_node_select_method_id.xml              |   5 +-
 .../my_node_title_method_id.xml               |   5 +-
 .../NodeBudgetVariation_view/my_title.xml     |   5 +-
 .../my_translated_portal_type.xml             |   5 +-
 .../my_variation_base_category.xml            |  10 +-
 .../budget_interaction_workflow.xml           |   5 +-
 .../interactions.xml                          |   5 +-
 .../interactions/setSpecialise.xml            |   5 +-
 .../interactions/setVariationCategoryList.xml |   5 +-
 .../budget_interaction_workflow/scripts.xml   |   5 +-
 .../scripts/initializeBudget.xml              |   5 +-
 ...erionCategoryListFromVariationCategory.xml |   5 +-
 .../budget_interaction_workflow/variables.xml |   5 +-
 .../budget_interaction_workflow/worklists.xml |   5 +-
 .../budget_line_interaction_workflow.xml      |   5 +-
 .../interactions.xml                          |   5 +-
 .../interactions/setVariationCategoryList.xml |   5 +-
 .../scripts.xml                               |   5 +-
 .../scripts/BudgetLine_updateCellRange.xml    |   5 +-
 .../variables.xml                             |   5 +-
 .../worklists.xml                             |   5 +-
 .../budget_transaction_workflow.xml           |   5 +-
 .../budget_transaction_workflow/scripts.xml   |   5 +-
 .../BudgetTransaction_checkFeasability.xml    |   5 +-
 .../budget_transaction_workflow/states.xml    |   5 +-
 .../states/cancelled.xml                      |   5 +-
 .../states/delivered.xml                      |   5 +-
 .../states/draft.xml                          |   5 +-
 .../transitions.xml                           |   5 +-
 .../transitions/cancel.xml                    |   5 +-
 .../transitions/cancel_action.xml             |   5 +-
 .../transitions/deliver.xml                   |   5 +-
 .../transitions/deliver_action.xml            |   5 +-
 .../transitions/drafting.xml                  |   5 +-
 .../transitions/drafting_action.xml           |   5 +-
 .../budget_transaction_workflow/variables.xml |   5 +-
 .../variables/action.xml                      |   5 +-
 .../variables/actor.xml                       |   5 +-
 .../variables/comment.xml                     |   5 +-
 .../variables/error_message.xml               |   5 +-
 .../variables/history.xml                     |   5 +-
 .../variables/time.xml                        |   5 +-
 .../budget_transaction_workflow/worklists.xml |   5 +-
 .../portal_workflow/budget_workflow.xml       |   5 +-
 .../budget_workflow/scripts.xml               |   5 +-
 .../scripts/checkConsistency.xml              |   5 +-
 .../budget_workflow/states.xml                |   5 +-
 .../budget_workflow/states/cancelled.xml      |  10 +-
 .../budget_workflow/states/deleted.xml        |  10 +-
 .../budget_workflow/states/draft.xml          |  10 +-
 .../budget_workflow/states/submitted.xml      |  10 +-
 .../budget_workflow/states/validated.xml      |  10 +-
 .../budget_workflow/transitions.xml           |   5 +-
 .../budget_workflow/transitions/cancel.xml    |   5 +-
 .../transitions/cancel_action.xml             |  10 +-
 .../budget_workflow/transitions/delete.xml    |   5 +-
 .../transitions/delete_action.xml             |  10 +-
 .../transitions/invalidate.xml                |   5 +-
 .../transitions/invalidate_action.xml         |  10 +-
 .../budget_workflow/transitions/submit.xml    |   5 +-
 .../transitions/submit_action.xml             |  10 +-
 .../budget_workflow/transitions/validate.xml  |   5 +-
 .../transitions/validate_action.xml           |  10 +-
 .../budget_workflow/variables.xml             |   5 +-
 .../budget_workflow/variables/action.xml      |  10 +-
 .../budget_workflow/variables/actor.xml       |  10 +-
 .../budget_workflow/variables/comment.xml     |  10 +-
 .../variables/error_message.xml               |   5 +-
 .../budget_workflow/variables/history.xml     |  10 +-
 .../budget_workflow/variables/portal_type.xml |   5 +-
 .../budget_workflow/variables/time.xml        |  10 +-
 .../budget_workflow/worklists.xml             |   5 +-
 .../worklists/1_submitted_budget_list.xml     |  15 +-
 bt5/erp5_budget/bt/revision                   |   2 +-
 .../bt/template_catalog_search_key_list       |   0
 279 files changed, 357 insertions(+), 2041 deletions(-)
 create mode 100644 bt5/erp5_budget/bt/template_catalog_search_key_list

diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Cell/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Cell/view.xml
index 2c2efa4a20..3121984c7a 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Cell/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/available_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/available_view.xml
index cc347d42ee..d7cc3a26a7 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/available_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/available_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/consumed_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/consumed_view.xml
index 76bb603375..05ab7cd213 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/consumed_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/consumed_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/current_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/current_view.xml
index 98e81c247e..4f53c392d3 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/current_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/current_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/engaged_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/engaged_view.xml
index 1f53434692..2284764306 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/engaged_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/engaged_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/initial_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/initial_view.xml
index b427b12964..927c9d6f6a 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/initial_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/initial_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/update_summary_budget_cell.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/update_summary_budget_cell.xml
index 1e669c85a4..d0d67409ef 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/update_summary_budget_cell.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Line/update_summary_budget_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model%20Module/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model%20Module/view.xml
index b5f4641f9a..59b0e12023 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model%20Module/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model/view.xml
index 8dbc85f123..78636ff8fb 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Model/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_export.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_export.xml
index 73b4943e7f..14ed9fc209 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_export.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_export.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/BudgetModule_viewBudgetConsumptionReportDialog?your_portal_
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_report.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_report.xml
index 3fbda1a4ee..c19c08ee9d 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_report.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/budget_group_consumption_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/view.xml
index 9c17d5df24..7e937a1832 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction%20Module/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction%20Module/view.xml
index b260a5768f..043fb68bde 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction%20Module/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction/view.xml
index a6a1fd1868..6b3022771b 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transaction/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer%20Line/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer%20Line/view.xml
index f4d0d12420..2d8bc9e2f1 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer%20Line/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer/view.xml
index 6b8cdfe25e..e6068c1b60 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget%20Transfer/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_export.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_export.xml
index 6ac864515a..bd180bb38c 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_export.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_export.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Budget_viewBudgetConsumptionReportDialog?your_portal_skin=O
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_report.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_report.xml
index 2bbec175f1..4dbdae6370 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_report.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/budget_group_consumption_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/original_budget.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/original_budget.xml
index 351643adbb..b46cd9a0ff 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/original_budget.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/original_budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/transfer_line_list_view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/transfer_line_list_view.xml
index bd7c722982..4fc15eabfc 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/transfer_line_list_view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/transfer_line_list_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/view.xml
index 9dd217165f..80eb262630 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Budget/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Category%20Budget%20Variation/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Category%20Budget%20Variation/view.xml
index 5a630dc208..9c5d5e3c3b 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Category%20Budget%20Variation/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Category%20Budget%20Variation/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ActionTemplateItem/portal_types/Node%20Budget%20Variation/view.xml b/bt5/erp5_budget/ActionTemplateItem/portal_types/Node%20Budget%20Variation/view.xml
index 1f3468e029..ba176e3871 100644
--- a/bt5/erp5_budget/ActionTemplateItem/portal_types/Node%20Budget%20Variation/view.xml
+++ b/bt5/erp5_budget/ActionTemplateItem/portal_types/Node%20Budget%20Variation/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_line_type.xml b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_line_type.xml
index 36ba4ef986..1eb48af2d7 100644
--- a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_line_type.xml
+++ b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_line_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_section.xml b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_section.xml
index a5a2167f02..0bb8209577 100644
--- a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_section.xml
+++ b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_section.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_variation.xml b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_variation.xml
index 7c6438b3d8..4c5adc747e 100644
--- a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_variation.xml
+++ b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/budget_variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/inventory_axis.xml b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/inventory_axis.xml
index 19b5a2539f..81d9433de6 100644
--- a/bt5/erp5_budget/CategoryTemplateItem/portal_categories/inventory_axis.xml
+++ b/bt5/erp5_budget/CategoryTemplateItem/portal_categories/inventory_axis.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
-        <tuple/>
-      </tuple>
+      <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml b/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
index afb763e3e3..ec8b027b63 100644
--- a/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
+++ b/bt5/erp5_budget/ModuleTemplateItem/budget_transaction_module.xml
@@ -10,10 +10,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access arbitrary user session data</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
@@ -23,14 +19,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access future portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Access inactive portal content</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
@@ -40,415 +28,23 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Accelerated HTTP Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add BTreeFolder2s</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Action Icons Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Active Processs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Caching Policy Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Calendar Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Core Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Default Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Setup Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Unique Id Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFCategory Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFMailIn Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Configured CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Content Type Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Documents, Images, and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Filesystem Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 OOo Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Publications</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Reports</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Subscriptions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Catalog Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Form Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Subversion Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5SyncML Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Type Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtFiles</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtImages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Filesystem Directory Views</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalContents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Localizers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MailHost objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MessageCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Pluggable Index</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add RAM Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ReStructuredText Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Site Roots</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Temporary Folder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add User Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Virtual Host Monsters</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Vocabularies</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z Gadfly Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Deferred Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZODB Mount Points</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Zope Tutorials</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal events</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal member</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Fields</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Images and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Lock Information</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change bindings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache settings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change configuration</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change permissions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal events</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change proxy roles</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
@@ -458,51 +54,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Create Transient Objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Create class instances</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Define permissions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Download ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit ReStructuredText</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit target</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>FTP access</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Import/Export objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Join/leave Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
@@ -512,167 +68,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>List portal members</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>List undoable changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log Site Errors</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log to the Event Log</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Mail forgotten password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Access Rules</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Groups</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Selenium test cases</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage WebDAV Locks</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Z Classes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalog Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalogIndex Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage languages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage portal</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage users</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Modify Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connection</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Query Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Reply to item</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Request review</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Review portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Save/discard Version changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search ZCatalog</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search for principals</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Take ownership</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Test Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Translate Content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Undo changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use mailhost services</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
@@ -690,26 +90,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>View management screens</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Lock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Unlock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV access</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Budget Transaction Module</portal_type>
  <title>Budget Transactions</title>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget.xml
index d24e8ff400..1b711449a0 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_cell.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_cell.xml
index 07e8bbd581..fb11d7f6c1 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_cell.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_line.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_line.xml
index d20ddb5061..e7d52125a7 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_line.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/budget_variation/budget_line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function.xml
index fe9acfcb41..4bbf457eb6 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function_category.xml
index f02748ed2c..b89db102c4 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/function_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node.xml
index f7d9bce5b4..a32fa285b7 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category.xml
index 14776c586b..babfb0adb7 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category_strict_membership.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category_strict_membership.xml
index 64355676d3..08401c8666 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category_strict_membership.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_node_category_strict_membership.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section.xml
index 7ba2ee3117..4d068f5cd6 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category.xml
index f192f13ba2..01b53c3ea1 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category_strict_membership.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category_strict_membership.xml
index 8025242c6c..8cb1fece14 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category_strict_membership.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/mirror_section_category_strict_membership.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement.xml
index 3fbcfa0c8b..fb66545a5a 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement_strict_membership.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement_strict_membership.xml
index fad2482b6b..3d616353bf 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement_strict_membership.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/movement_strict_membership.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node.xml
index fe944066e3..f38bf8edd9 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category.xml
index a0661dff7f..44a8b3a3ac 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category_strict_membership.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category_strict_membership.xml
index 37757cb6e5..27d2af07e3 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category_strict_membership.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/node_category_strict_membership.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment.xml
index 94f7170459..c3fa0aa05d 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment_category.xml
index 78042187dd..b137c284b1 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/payment_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/project.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/project.xml
index 3553b5a7a7..a5af02c67d 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/project.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/project.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section.xml
index b539ba8b68..df0c2cd10b 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category.xml
index d7fe76bc8b..1e43587360 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category_strict_membership.xml b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category_strict_membership.xml
index 853f21149b..0bd37c689f 100644
--- a/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category_strict_membership.xml
+++ b/bt5/erp5_budget/PathTemplateItem/portal_categories/inventory_axis/section_category_strict_membership.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Category" module="Products.ERP5Type.Document.Category"/>
-        <tuple/>
-      </tuple>
+      <global name="Category" module="Products.ERP5Type.Document.Category"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget.xml
index 87186a44a7..f3143b3ed7 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/AccountingTransactionLine_getBudgetCellList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/AccountingTransactionLine_getBudgetCellList.xml
index 09f895524a..83673caeec 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/AccountingTransactionLine_getBudgetCellList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/AccountingTransactionLine_getBudgetCellList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
index 477e694b8a..fc35196a53 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asPredicate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
index d00adb6eb3..111fa29193 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_asTitle.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
index 8ffdd825eb..c83c112efa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
index 3f5cf975e3..eb4bb2b314 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view.xml
index 8469800f43..d502f5f3fa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_available_budget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_available_budget.xml
index cf080e5e61..e77f5ceaac 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_available_budget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_available_budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -127,10 +124,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_consumed_budget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_consumed_budget.xml
index ad63004e8d..417a205261 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_consumed_budget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_consumed_budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -127,10 +124,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_engaged_budget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_engaged_budget.xml
index 927f1f821c..3f901e0678 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_engaged_budget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_engaged_budget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -127,10 +124,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_quantity.xml
index ec5a7e074b..5c7ccf86dd 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
index 09cf7d9f2f..91fad2d41b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
index a01c85aa70..addeb56018 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAccountList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAccountList.xml
index ffa0f93069..1e871e4fb2 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAccountList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAccountList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAvailableBudgetCell.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAvailableBudgetCell.xml
index 5f8f3fed25..57bbf118ff 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAvailableBudgetCell.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getAvailableBudgetCell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetCell.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetCell.xml
index 410cd7da3f..aef98aa894 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetCell.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetCell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetMovementList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetMovementList.xml
index 255b730073..8a49c6d721 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetMovementList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumedBudgetMovementList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,7 @@
 kw.update(context.BudgetLine_getInventoryQueryDictForCellIndex(\n
             cell_index=cell_index,\n
             engaged_budget=engaged_budget))\n
+\n
 return context.getPortalObject().portal_simulation.getMovementHistoryList(**kw)\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumptionSign.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumptionSign.xml
index efecadfbd7..cebfb378c0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumptionSign.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getConsumptionSign.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEditablePropertyList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEditablePropertyList.xml
index 053212f69f..3be688288a 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEditablePropertyList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEditablePropertyList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEngagedBudgetCell.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEngagedBudgetCell.xml
index 96e61ba842..aafeee3cdf 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEngagedBudgetCell.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getEngagedBudgetCell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getFinancialSectionRelatedAccountList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getFinancialSectionRelatedAccountList.xml
index d7b6b109ef..d382685131 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getFinancialSectionRelatedAccountList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getFinancialSectionRelatedAccountList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getInventoryQueryDictForCellIndex.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getInventoryQueryDictForCellIndex.xml
index e8d4b8403c..5487b4d8f2 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getInventoryQueryDictForCellIndex.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getInventoryQueryDictForCellIndex.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryCellIndexDict.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryCellIndexDict.xml
index 63439919c3..f5165448d9 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryCellIndexDict.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryCellIndexDict.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryDimensionKeyDict.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryDimensionKeyDict.xml
index 5ad417d083..1805a53e24 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryDimensionKeyDict.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getSummaryDimensionKeyDict.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getVariationRangeCategoryList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getVariationRangeCategoryList.xml
index 563b3d8793..e2d618ca3e 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getVariationRangeCategoryList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_getVariationRangeCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_hashVariationCategoryList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_hashVariationCategoryList.xml
index 0b1472d4b9..3fae039782 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_hashVariationCategoryList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_hashVariationCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
index 7e2a051e14..2061e423ae 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_init.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_setQuantityOnSummaryCellList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_setQuantityOnSummaryCellList.xml
index b42c4a759b..4b0e8a1975 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_setQuantityOnSummaryCellList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_setQuantityOnSummaryCellList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statCreditPrice.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statCreditPrice.xml
index 292d720e3f..c464deb061 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statCreditPrice.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statCreditPrice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statDebitPrice.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statDebitPrice.xml
index 071f5352d1..19a0ca14a7 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statDebitPrice.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statDebitPrice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statTotalPrice.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statTotalPrice.xml
index 81fb83d568..9c96412987 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statTotalPrice.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_statTotalPrice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view.xml
index a786446bed..5dce107dc8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/mapped_value_property_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/mapped_value_property_list.xml
index 3cb9ca3be0..2b55c6fa47 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/mapped_value_property_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/mapped_value_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox.xml
index 2b5218d798..108db91c03 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_credit.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_credit.xml
index f5e1cc5128..db347e835e 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_credit.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_credit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -104,10 +101,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_debit.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_debit.xml
index 5dd59b1be6..a5346b458f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_debit.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_destination_debit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -113,10 +110,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_membership_criterion_category_list.xml
index 7cfacd99d9..466150d5e0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_membership_criterion_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -106,10 +103,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_quantity.xml
index 1926da9c2b..2d766734f7 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
index 14d06a2ba0..d23b2d6990 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_budget_line_type.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_budget_line_type.xml
index 9fd87f9a01..57fc6ec550 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_budget_line_type.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_budget_line_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -113,10 +110,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_description.xml
index 9608be22fd..7e2c24f26f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_int_index.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_int_index.xml
index e6bc7e5a59..c335591867 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_int_index.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_int_index.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_title.xml
index 5bce4ae84d..b9cb333e15 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_variation_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_variation_category_list.xml
index c52c489322..ff099e41c7 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/my_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
-        <tuple/>
-      </tuple>
+      <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -286,10 +283,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -302,10 +296,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget.xml
index ee0085d9fd..93ffa1f25f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox.xml
index 38e967bf72..e236a87f8d 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox_quantity.xml
index 233bc8233a..3c1c53e649 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -109,10 +106,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_description.xml
index 9608be22fd..7e2c24f26f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewAvailableBudget/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget.xml
index 20c132e952..17fa011b7d 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox.xml
index 525beac95a..06d053fa49 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox_quantity.xml
index 71db285868..5c5afa53e4 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -122,10 +119,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_description.xml
index 9608be22fd..7e2c24f26f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudget/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList.xml
index 3e637058be..b4059c05a8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox.xml
index 6d66dc7a49..98d4731b93 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -274,10 +271,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -290,10 +284,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -306,10 +297,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit.xml
index 955458c51d..5e8e29a508 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit_price.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit_price.xml
index 2da612c178..fe03a0a2ab 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit_price.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_credit_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_date.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_date.xml
index 0115c6b732..050fda51f6 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_date.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit.xml
index d658a5fb1a..4e241e21b8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit_price.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit_price.xml
index 15eae6049f..3dab2fcd67 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit_price.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_debit_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_running_total_price.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_running_total_price.xml
index 116440d13f..55eed1f590 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_running_total_price.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_running_total_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_total_price.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_total_price.xml
index 6ba1303c64..d69f88fbfb 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_total_price.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/listbox_total_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewConsumedBudgetMovementList/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget.xml
index efa865ca85..340b83d975 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox.xml
index 07a78decc7..503d102a50 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox_quantity.xml
index 646d2d4c6c..d4280042fd 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -113,10 +110,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_description.xml
index 9608be22fd..7e2c24f26f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewCurrentBudget/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget.xml
index f5d3ae6bd9..b86f2267b5 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox.xml
index bd7b618523..f7c55760cb 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox_quantity.xml
index cc23a844fa..ae8ec3791c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -113,10 +110,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_description.xml
index 9608be22fd..7e2c24f26f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_title.xml
index e768914b9d..10a7137998 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewEngagedBudget/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary.xml
index 5d28ae0cb1..5edce5b4fa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/mapped_value_property_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/mapped_value_property_list.xml
index d507dadb87..4b33b4361f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/mapped_value_property_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/mapped_value_property_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinesField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinesField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox.xml
index e5942e7548..993e93ab07 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
-        <tuple/>
-      </tuple>
+      <global name="MatrixBox" module="Products.ERP5Form.MatrixBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -312,10 +309,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_membership_criterion_category_list.xml
index 3a463f4872..66db956334 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_membership_criterion_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinesField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinesField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_quantity.xml
index 75a587b83c..07248fa7c8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/matrixbox_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -135,10 +132,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -151,10 +145,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -167,10 +158,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/membership_criterion_base_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/membership_criterion_base_category_list.xml
index 89f6a6c744..22f64c2479 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/membership_criterion_base_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="LinesField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="LinesField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -302,10 +299,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_description.xml
index 57fbd01268..b006ddf1ea 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_resource_title.xml
index 94d8ee6f61..8f9e6b4550 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -130,10 +127,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_title.xml
index 9b2dabb522..cedc3b4959 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewFieldLibrary/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewSetQuantityOnSummaryCellListDialog.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewSetQuantityOnSummaryCellListDialog.xml
index 864f0d772a..14a43cc167 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewSetQuantityOnSummaryCellListDialog.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_viewSetQuantityOnSummaryCellListDialog.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList.xml
index bb0ba8d726..01059e1256 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList/listbox.xml
index 4754ca8a4f..360660c070 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModelModule_viewBudgetModelList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view.xml
index 49ff8fe138..5fb3b90c3b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/listbox.xml
index 7f6d59afcc..ce3890f422 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_title.xml
index ea78bd553c..0397f4f20c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_translated_validation_state_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModel_view/my_translated_validation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_at_date.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_at_date.xml
index 6d2d91f617..2b344995eb 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_at_date.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_at_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_deferred_style.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_deferred_style.xml
index 0d330295cc..07ae06026f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_deferred_style.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_deferred_style.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_format.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_format.xml
index be5e86c886..a4aca4a484 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_format.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_format.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_from_date.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_from_date.xml
index 9076e2f5a4..9d7b5e377b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_from_date.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_from_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_section_category.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_section_category.xml
index 42ae5f8972..468fa109f5 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_section_category.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_section_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -104,10 +101,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -120,10 +114,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_validation_state.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_validation_state.xml
index 15a6e05a32..14d1c78659 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_validation_state.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_validation_state.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -280,10 +274,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -296,10 +287,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml
index 10b2d102be..02d35bd0aa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml
index 20ab4b8ffd..43c8846ed0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml
index 21199fa96e..381b9e4790 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml
index 2fc3205531..36565504ff 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList.xml
index 85a79bd0ed..018f18a026 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList/listbox.xml
index 52bb85b9fb..47191c99d9 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransactionModule_viewBudgetTransactionList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
index 396f5bbd4b..ffbc8569ce 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_getBudgetCellList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
index 2e5808c9d3..81006cf1d5 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_init.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view.xml
index fcc438d0c1..e69a8b00a6 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_description.xml
index 0bd57a19e9..3f183ed2d5 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_destination.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_destination.xml
index 21ed224844..c53bf322c6 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_destination.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_destination.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_quantity.xml
index 3b819242b7..5e51478d27 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FloatField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FloatField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_resource_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_resource_title.xml
index e63fac52ed..0b273b95fb 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_resource_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
-        <tuple/>
-      </tuple>
+      <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_source.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_source.xml
index bf434c869c..fd3d08ad6c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_source.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_source.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_start_date.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_start_date.xml
index 7a99d092c1..d34194b258 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_start_date.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_start_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_translated_simulation_state_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_translated_simulation_state_title.xml
index 7badf51edc..36d806a965 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransaction_view/my_translated_simulation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view.xml
index cfbc1a540e..7d1df77a2a 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_description.xml
index 6813057e99..b80396de8c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_destination.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_destination.xml
index f6e56ec811..87b6f57511 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_destination.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_destination.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_quantity.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_quantity.xml
index 3b819242b7..5e51478d27 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_quantity.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FloatField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FloatField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_resource_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_resource_title.xml
index e63fac52ed..0b273b95fb 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_resource_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
-        <tuple/>
-      </tuple>
+      <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_source.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_source.xml
index ac06b85b4a..e8db78b1ea 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_source.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetTransferLine_view/my_source.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml
index c029bdc1d8..8bda048266 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getVariationRangeCategoryList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getVariationRangeCategoryList.xml
index adf95556ca..c6899da1d8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getVariationRangeCategoryList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getVariationRangeCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_hashVariationCategoryList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_hashVariationCategoryList.xml
index 329a0bcb81..6c8d890331 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_hashVariationCategoryList.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_hashVariationCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view.xml
index 1da74e8f0d..adc32b62b1 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/listbox.xml
index 7323a1a544..d1e02d2da8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/listbox.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_budget_type.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_budget_type.xml
index f0a1009656..80925ce497 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_budget_type.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_budget_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_description.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_description.xml
index 6813057e99..b80396de8c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_description.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_reference.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_reference.xml
index 9b758e5871..85aefd2b91 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_reference.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_reference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_resource_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_resource_title.xml
index 94d8ee6f61..8f9e6b4550 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_resource_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_resource_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -130,10 +127,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_specialise_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_specialise_title.xml
index ba519f8fd3..806a964f03 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_specialise_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_specialise_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_max.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_max.xml
index f3e0b7e269..5e73337054 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_max.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_max.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_min.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_min.xml
index e49abc2b53..62b2632546 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_min.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_start_date_range_min.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_title.xml
index ea78bd553c..0397f4f20c 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_translated_validation_state_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_translated_validation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_variation_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_variation_category_list.xml
index 1da4f28e62..2e5a9ed2a8 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_variation_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_variation_category_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
-        <tuple/>
-      </tuple>
+      <global name="ParallelListField" module="Products.ERP5Form.ParallelListField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -286,10 +283,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -302,10 +296,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_version.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_version.xml
index 046ca7b4f3..744f773749 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_version.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_view/my_version.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReport.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReport.xml
index 1f5eb2cb65..4306ef3ce0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReport.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReport.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog.xml
index d30d02b7b2..24995bea5b 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_deferred_style.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_deferred_style.xml
index 0d330295cc..07ae06026f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_deferred_style.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_deferred_style.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_format.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_format.xml
index be5e86c886..a4aca4a484 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_format.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportDialog/your_format.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportTemplate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportTemplate.xml
index 3c16c362ff..8a1cfc2356 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportTemplate.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReportTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view.xml
index e671411669..71d420bb44 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_budget_variation.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_budget_variation.xml
index 1d6ee222a3..03e184b5aa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_budget_variation.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_budget_variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_int_index.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_int_index.xml
index e56c3f3144..5e82e980e2 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_int_index.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_int_index.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_inventory_axis.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_inventory_axis.xml
index 3d9311ee58..79eb95ead3 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_inventory_axis.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_inventory_axis.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_title.xml
index 6b82ce9ff2..d619932135 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_translated_portal_type.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_translated_portal_type.xml
index e5e542bb59..4cc8a0073d 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_translated_portal_type.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_translated_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_variation_base_category.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_variation_base_category.xml
index 1777ef5003..70cf036ed0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_variation_base_category.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/CategoryBudgetVariation_view/my_variation_base_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view.xml
index f13b90cac1..e4b767a2d6 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_aggregate_title_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_aggregate_title_list.xml
index b460c783e5..a036c74644 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_aggregate_title_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -600,10 +597,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_budget_variation.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_budget_variation.xml
index 1d6ee222a3..03e184b5aa 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_budget_variation.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_budget_variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_include_virtual_other_node.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_include_virtual_other_node.xml
index 2545507040..0dc75a50b4 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_include_virtual_other_node.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_include_virtual_other_node.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_int_index.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_int_index.xml
index e56c3f3144..5e82e980e2 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_int_index.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_int_index.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_inventory_axis.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_inventory_axis.xml
index 3d9311ee58..79eb95ead3 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_inventory_axis.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_inventory_axis.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_select_method_id.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_select_method_id.xml
index 7a3b5f9013..35ddbb30de 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_select_method_id.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_select_method_id.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_title_method_id.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_title_method_id.xml
index 19a0fa7d26..abd6418026 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_title_method_id.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_node_title_method_id.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_title.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_title.xml
index 6b82ce9ff2..d619932135 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_title.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_translated_portal_type.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_translated_portal_type.xml
index e5e542bb59..4cc8a0073d 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_translated_portal_type.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_translated_portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_variation_base_category.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_variation_base_category.xml
index 1777ef5003..70cf036ed0 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_variation_base_category.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/NodeBudgetVariation_view/my_variation_base_category.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +102,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml
index 9bc9b4b4a5..43d7f49363 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
-        <tuple/>
-      </tuple>
+      <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Interaction" module="Products.ERP5.Interaction"/>
-        <tuple/>
-      </tuple>
+      <global name="Interaction" module="Products.ERP5.Interaction"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setSpecialise.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setSpecialise.xml
index cf7d377355..c6c61183f8 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setSpecialise.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setSpecialise.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
-      </tuple>
+      <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setVariationCategoryList.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setVariationCategoryList.xml
index a9cea31d8b..923b85ec34 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setVariationCategoryList.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/interactions/setVariationCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
-      </tuple>
+      <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/initializeBudget.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/initializeBudget.xml
index c823a19c89..43fd2f3706 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/initializeBudget.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/initializeBudget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
index d31db74ff9..54cca2366d 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/variables.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/variables.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/worklists.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/worklists.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
index 13b2203f61..e55e162cea 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
-        <tuple/>
-      </tuple>
+      <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Interaction" module="Products.ERP5.Interaction"/>
-        <tuple/>
-      </tuple>
+      <global name="Interaction" module="Products.ERP5.Interaction"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions/setVariationCategoryList.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions/setVariationCategoryList.xml
index 55053fffba..5c7225bd1a 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions/setVariationCategoryList.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/interactions/setVariationCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-        <tuple/>
-      </tuple>
+      <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
index 2fd99a2eb4..522d5476d1 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/scripts/BudgetLine_updateCellRange.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/variables.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/variables.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/worklists.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/worklists.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_line_interaction_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
index fafadc8102..a109833bbf 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
-        <tuple/>
-      </tuple>
+      <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
index fc918f2f90..206c0cecbc 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/scripts/BudgetTransaction_checkFeasability.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="States" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="States" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/cancelled.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/cancelled.xml
index d4153dd8c9..dbc084d4e2 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/cancelled.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/cancelled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/delivered.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/delivered.xml
index 96e6a08a29..0c37ef6c99 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/delivered.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/delivered.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/draft.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/draft.xml
index 9bffe7a817..cfcde0c2d7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/draft.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/states/draft.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel.xml
index e1b5c0e029..c153db1835 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel_action.xml
index cb8b13c4e4..e9fc54d6a7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/cancel_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver.xml
index f3f986ed36..1885dc944e 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver_action.xml
index 2013fa4180..60b18db610 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/deliver_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting.xml
index 709383ff87..3f534e594e 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting_action.xml
index f753878b8a..6b0bb9d55d 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/transitions/drafting_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/comment.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/comment.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/comment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/error_message.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/error_message.xml
index e89715783d..69512a44bc 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/error_message.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/error_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/history.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/history.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/time.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/time.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/worklists.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/worklists.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
index 7041ca3f0d..fcd730da9e 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
-        <tuple/>
-      </tuple>
+      <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-        <tuple/>
-      </tuple>
+      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
index ab1278b560..9d113170b6 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/scripts/checkConsistency.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="States" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="States" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
index 26f49a07ea..3f1dfeae5a 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/cancelled.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
index 1aeed1c6b4..439857330f 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/deleted.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -44,10 +41,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
index 13034e3c21..4c06302935 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/draft.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -49,10 +46,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
index cf4dda81eb..ad7bbe374b 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/submitted.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -49,10 +46,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
index c19e3a26a0..9fa620149b 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/states/validated.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
-        <tuple/>
-      </tuple>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -47,10 +44,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
index 410e2c9458..6504d761f5 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
index b2b2a6f1d0..c8a4ddba73 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/cancel_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
index 2b9bc536cc..fec7699771 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
index d5f67ffd1c..3e93b38683 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/delete_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate.xml
index 6b32fec78e..6808173fc8 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate_action.xml
index 323af4f751..c6b619bdb6 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/invalidate_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
index e7b53af0b9..5984c7e0f5 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
index e12931a5e2..c73304a0da 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/submit_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
index d1e1a2a61d..8e6b9ec1c4 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
index 8d57eb02ee..85ed78eb54 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/transitions/validate_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
-        <tuple/>
-      </tuple>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -60,10 +57,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Variables" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="Variables" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
index b6ab718b6e..cf9789beee 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
index 63e83eebcc..99dc5a1238 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
index 0deee79ddd..37beb5e4f4 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/comment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/error_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
index 33a2afbc9a..44306b76d7 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/history.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
index d1c833ff18..318e098ff6 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/portal_type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
index 624cc5038c..5a517524ee 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/time.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
-        <tuple/>
-      </tuple>
+      <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_submitted_budget_list.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_submitted_budget_list.xml
index e707be649d..7966cc77d5 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_submitted_budget_list.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/worklists/1_submitted_budget_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
-        <tuple/>
-      </tuple>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,10 +47,7 @@ budget_module/view?validation_state=submitted&local_roles:list=Assignor&reset=1
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Guard" module="Products.DCWorkflow.Guard"/>
-        <tuple/>
-      </tuple>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +64,7 @@ budget_module/view?validation_state=submitted&local_roles:list=Assignor&reset=1
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_budget/bt/revision b/bt5/erp5_budget/bt/revision
index 8db9866c84..4f37670799 100644
--- a/bt5/erp5_budget/bt/revision
+++ b/bt5/erp5_budget/bt/revision
@@ -1 +1 @@
-332
\ No newline at end of file
+333
\ No newline at end of file
diff --git a/bt5/erp5_budget/bt/template_catalog_search_key_list b/bt5/erp5_budget/bt/template_catalog_search_key_list
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.30.9