From 7b14e1ede01a0e5a7c032a6671f808f0bcb398bb Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Thu, 4 Nov 2010 20:31:09 +0000
Subject: [PATCH] XML changes: erp5_base, erp5_pdm, erp5_simulation

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39933 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Address/change_function.xml  | 10 ++-----
 .../portal_types/Address/view.xml             | 10 ++-----
 .../portal_types/Agent%20Privilege/view.xml   | 10 ++-----
 .../portal_types/Agent/download.xml           | 10 ++-----
 .../portal_types/Agent/import.xml             | 10 ++-----
 .../portal_types/Agent/signature.xml          | 10 ++-----
 .../portal_types/Agent/view.xml               | 10 ++-----
 .../portal_types/Assignment/view.xml          | 10 ++-----
 .../portal_types/Bank%20Account/view.xml      | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../portal_types/Career/change_function.xml   | 10 ++-----
 .../portal_types/Career/view.xml              | 10 ++-----
 .../Category%20Movement%20Group/view.xml      | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Causality%20Movement%20Group/view.xml     | 10 ++-----
 .../portal_types/Chat%20Address/view.xml      | 10 ++-----
 .../portal_types/Credit%20Card/view.xml       | 10 ++-----
 .../Currency%20Exchange%20Line/view.xml       | 10 ++-----
 .../portal_types/Currency%20Module/view.xml   | 10 ++-----
 .../portal_types/Currency/view.xml            | 10 ++-----
 .../Day%20Movement%20Group/view.xml           | 10 ++-----
 .../portal_types/Delivery%20Builder/view.xml  | 10 ++-----
 .../view_predicate_group.xml                  | 10 ++-----
 .../Delivery%20Builder/view_profile.xml       | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../portal_types/Email/change_function.xml    | 10 ++-----
 .../portal_types/Email/view.xml               | 10 ++-----
 .../portal_types/Fax/change_function.xml      | 10 ++-----
 .../portal_types/Fax/view.xml                 | 10 ++-----
 .../portal_types/File/download.xml            | 10 ++-----
 .../portal_types/File/view.xml                | 10 ++-----
 .../portal_types/Image/change_function.xml    | 10 ++-----
 .../portal_types/Image/download.xml           | 10 ++-----
 .../portal_types/Image/fullsize_view.xml      | 10 ++-----
 .../portal_types/Image/view.xml               | 10 ++-----
 .../Invoice%20Movement%20Group/view.xml       | 10 ++-----
 .../portal_types/Link/view.xml                | 10 ++-----
 .../portal_types/Mapped%20Property/view.xml   | 10 ++-----
 .../Mirror%20Movement%20Group/view.xml        | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Nested%20Line%20Movement%20Group/view.xml | 10 ++-----
 .../Notification%20Message%20Module/view.xml  | 10 ++-----
 .../Notification%20Message/list.xml           | 10 ++-----
 .../local_permission.xml                      | 10 ++-----
 .../Notification%20Message/view.xml           | 10 ++-----
 .../Notification%20Message/view_editor.xml    | 10 ++-----
 .../portal_types/Order%20Builder/view.xml     | 10 ++-----
 .../Order%20Builder/view_predicate_group.xml  | 10 ++-----
 .../Order%20Builder/view_profile.xml          | 10 ++-----
 .../Order%20Movement%20Group/view.xml         | 10 ++-----
 .../portal_types/Order%20Tool/view.xml        | 10 ++-----
 .../Organisation%20Module/view.xml            | 10 ++-----
 .../portal_types/Organisation/details.xml     | 10 ++-----
 .../Organisation/document_view.xml            | 10 ++-----
 .../Organisation/financial_view.xml           | 10 ++-----
 .../Organisation/jump_to_persons.xml          | 10 ++-----
 .../portal_types/Organisation/view.xml        | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../portal_types/Person%20Module/view.xml     | 10 ++-----
 .../portal_types/Person/assignment.xml        | 10 ++-----
 .../portal_types/Person/details.xml           | 10 ++-----
 .../portal_types/Person/document_view.xml     | 10 ++-----
 .../portal_types/Person/financial_view.xml    | 10 ++-----
 .../Person/person_detailed_report.xml         | 10 ++-----
 .../portal_types/Person/terminate_career.xml  | 10 ++-----
 .../portal_types/Person/view.xml              | 10 ++-----
 .../Preference/base_preference.xml            | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Property%20Movement%20Group/view.xml      | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../portal_types/Query%20Module/view.xml      | 10 ++-----
 .../portal_types/Query/view.xml               | 10 ++-----
 .../Requirement%20Movement%20Group/view.xml   | 10 ++-----
 .../portal_types/Role%20Definition/view.xml   | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Rounding%20Model/predicate_view.xml       | 10 ++-----
 .../portal_types/Rounding%20Model/view.xml    | 10 ++-----
 .../portal_types/Rounding%20Tool/view.xml     | 10 ++-----
 .../Split%20Movement%20Group/view.xml         | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Telephone/change_function.xml             | 10 ++-----
 .../portal_types/Telephone/view.xml           | 10 ++-----
 .../Title%20Movement%20Group/view.xml         | 10 ++-----
 .../Variant%20Movement%20Group/view.xml       | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../portal_actions/jump_query.xml             | 15 ++--------
 .../portal_actions/post_query.xml             | 15 ++--------
 .../z_related_default_email.xml               |  5 +---
 .../z_related_destination_person.xml          |  5 +---
 .../z_related_owner_title.xml                 |  5 +---
 .../z_related_resource_use.xml                |  5 +---
 .../z_related_source_organisation.xml         |  5 +---
 .../z_related_source_person.xml               |  5 +---
 .../portal_categories/agent.xml               |  9 ++----
 .../portal_categories/agent_privilege.xml     |  9 ++----
 .../portal_categories/bank_account_type.xml   |  5 +---
 .../portal_categories/collect_order_group.xml |  9 ++----
 .../portal_categories/conflicting_solver.xml  |  5 +---
 .../portal_categories/contributor.xml         |  9 ++----
 .../currency_exchange_type.xml                |  9 ++----
 .../portal_categories/delivery_builder.xml    |  9 ++----
 .../portal_categories/delivery_solver.xml     |  5 +---
 .../portal_categories/destination_carrier.xml |  5 +---
 .../destination_referral.xml                  |  5 +---
 .../portal_categories/destination_region.xml  |  9 ++----
 .../portal_categories/divergence_scope.xml    |  9 ++----
 .../portal_categories/economical_class.xml    |  9 ++----
 .../portal_categories/end_of.xml              |  9 ++----
 .../portal_categories/follow_up.xml           |  9 ++----
 .../portal_categories/function.xml            |  9 ++----
 .../portal_categories/gender.xml              |  9 ++----
 .../portal_categories/grade.xml               |  9 ++----
 .../portal_categories/group.xml               |  9 ++----
 .../portal_categories/insurance_coverage.xml  |  9 ++----
 .../portal_categories/legal_parent.xml        |  9 ++----
 .../portal_categories/marital_status.xml      |  9 ++----
 .../portal_categories/market_segment.xml      |  9 ++----
 .../portal_categories/nationality.xml         |  9 ++----
 .../portal_categories/natural_parent.xml      |  9 ++----
 .../portal_categories/order_builder.xml       |  9 ++----
 .../portal_categories/payment_mode.xml        |  9 ++----
 .../portal_categories/predecessor.xml         |  9 ++----
 .../portal_categories/price_currency.xml      |  9 ++----
 .../portal_categories/property_mapping.xml    |  5 +---
 .../portal_categories/region.xml              |  9 ++----
 .../portal_categories/resource_use.xml        |  5 +---
 .../portal_categories/role.xml                |  9 ++----
 .../portal_categories/salary_level.xml        |  9 ++----
 .../portal_categories/site.xml                |  9 ++----
 .../portal_categories/skill.xml               |  9 ++----
 .../portal_categories/social_form.xml         |  9 ++----
 .../portal_categories/solver.xml              |  5 +---
 .../portal_categories/source_carrier.xml      |  5 +---
 .../portal_categories/source_referral.xml     |  5 +---
 .../portal_categories/source_region.xml       |  9 ++----
 .../portal_categories/subordination.xml       |  9 ++----
 .../portal_categories/successor.xml           |  9 ++----
 .../portal_categories/trade_phase.xml         |  9 ++----
 .../portal_categories/update_frequency.xml    |  9 ++----
 .../portal_categories/use.xml                 |  9 ++----
 .../portal_caches/document_cache_factory.xml  |  9 ++----
 .../volatile_cache_plugin.xml                 |  5 +---
 .../collect_order_group/cell.xml              |  5 +---
 .../collect_order_group/delivery.xml          |  5 +---
 .../collect_order_group/line.xml              |  5 +---
 .../divergence_scope/category.xml             |  5 +---
 .../divergence_scope/property.xml             |  5 +---
 .../divergence_scope/quantity.xml             |  5 +---
 .../persistent_memcached_plugin.xml           |  5 +---
 .../portal_types/Address.xml                  |  5 +---
 .../portal_types/Agent%20Privilege.xml        |  5 +---
 .../portal_types/Agent.xml                    |  5 +---
 .../portal_types/Assignment.xml               |  5 +---
 .../portal_types/Bank%20Account.xml           |  5 +---
 .../Base%20Variant%20Movement%20Group.xml     |  9 +++---
 .../portal_types/Career.xml                   |  5 +---
 .../Category%20Movement%20Group.xml           |  9 +++---
 ...sality%20Assignment%20Movement%20Group.xml |  9 +++---
 .../Causality%20Movement%20Group.xml          |  9 +++---
 .../portal_types/Chat%20Address.xml           |  5 +---
 .../portal_types/Credit%20Card.xml            |  5 +---
 .../Currency%20Exchange%20Cell.xml            |  5 +---
 .../Currency%20Exchange%20Line.xml            |  5 +---
 .../portal_types/Currency%20Module.xml        |  9 +++---
 .../portal_types/Currency.xml                 |  5 +---
 .../portal_types/Day%20Movement%20Group.xml   |  5 +---
 .../portal_types/Delivery%20Builder.xml       | 19 +++++-------
 ...sality%20Assignment%20Movement%20Group.xml |  9 +++---
 .../portal_types/Delivery%20Tool.xml          | 15 ++--------
 .../portal_types/Email.xml                    |  5 +---
 .../portal_types/Fax.xml                      |  5 +---
 .../portal_types/File.xml                     | 15 ++--------
 .../portal_types/Image.xml                    |  5 +---
 .../Invoice%20Movement%20Group.xml            | 15 ++--------
 .../portal_types/Link.xml                     |  5 +---
 .../portal_types/Mapped%20Property.xml        |  9 +++---
 .../Mirror%20Movement%20Group.xml             |  9 +++---
 .../Monthly%20Range%20Movement%20Group.xml    |  5 +---
 .../Nested%20Line%20Movement%20Group.xml      |  5 +---
 .../Notification%20Message%20Module.xml       | 19 +++++-------
 .../portal_types/Notification%20Message.xml   |  5 +---
 .../portal_types/Order%20Builder.xml          |  5 +---
 .../portal_types/Order%20Movement%20Group.xml |  9 +++---
 .../portal_types/Order%20Tool.xml             | 15 ++--------
 .../portal_types/Organisation%20Module.xml    |  9 +++---
 ...Delivery%20Category%20Movement%20Group.xml |  5 +---
 ...Delivery%20Property%20Movement%20Group.xml |  5 +---
 ...arent%20Explanation%20Movement%20Group.xml |  5 +---
 .../portal_types/Person%20Module.xml          |  9 +++---
 .../portal_types/Person.xml                   | 30 ++++---------------
 ...operty%20Assignment%20Movement%20Group.xml |  5 +---
 .../Property%20Movement%20Group.xml           |  9 +++---
 .../Quantity%20Sign%20Movement%20Group.xml    |  5 +---
 .../portal_types/Query%20Module.xml           |  9 +++---
 .../portal_types/Query.xml                    | 15 ++--------
 .../Requirement%20Movement%20Group.xml        |  9 +++---
 .../portal_types/Role%20Definition.xml        | 15 ++--------
 ...%20Rule%20Causality%20Movement%20Group.xml |  5 +---
 .../portal_types/Rounding%20Model.xml         | 15 ++--------
 .../portal_types/Rounding%20Tool.xml          | 15 ++--------
 .../portal_types/Split%20Movement%20Group.xml |  9 +++---
 ...x%20Line%20Delivery%20Movement%20Group.xml |  5 +---
 .../portal_types/Telephone.xml                |  5 +---
 .../portal_types/Title%20Movement%20Group.xml |  9 +++---
 .../Variant%20Movement%20Group.xml            |  9 +++---
 ...ariation%20Property%20Movement%20Group.xml |  5 +---
 .../portal_skins/erp5_base.xml                |  5 +---
 .../erp5_base/Address_viewFieldLibrary.xml    |  5 +---
 .../Address_viewFieldLibrary/my_city.xml      |  5 +---
 .../Address_viewFieldLibrary/my_region.xml    | 10 ++-----
 .../my_street_address.xml                     |  5 +---
 .../Address_viewFieldLibrary/my_zip_code.xml  |  5 +---
 .../erp5_base/AgentPrivilege_view.xml         |  5 +---
 .../my_agent_privilege.xml                    |  5 +---
 .../AgentPrivilege_view/my_description.xml    |  5 +---
 .../erp5_base/AgentPrivilege_view/my_id.xml   |  5 +---
 .../my_operation_upper_limit.xml              |  5 +---
 .../AgentPrivilege_view/my_start_date.xml     |  5 +---
 .../AgentPrivilege_view/my_stop_date.xml      |  5 +---
 .../portal_skins/erp5_base/Agent_view.xml     |  5 +---
 .../erp5_base/Agent_view/Image_view.xml       |  5 +---
 .../erp5_base/Agent_view/listbox.xml          | 10 ++-----
 .../Agent_view/listbox_agent_privilege.xml    |  5 +---
 .../listbox_operation_upper_limit.xml         |  5 +---
 .../Agent_view/listbox_start_date.xml         |  5 +---
 .../Agent_view/listbox_stop_date.xml          |  5 +---
 .../erp5_base/Agent_view/my_agent_title.xml   |  5 +---
 .../erp5_base/Agent_view/my_description.xml   |  5 +---
 .../erp5_base/Agent_view/my_int_index.xml     |  5 +---
 .../erp5_base/Agent_view/my_start_date.xml    |  5 +---
 .../Agent_viewFullSizedSignature.xml          |  5 +---
 .../image_view.xml                            |  5 +---
 .../Agent_viewImportSignatureDialog.xml       |  5 +---
 .../your_import_file.xml                      |  5 +---
 .../erp5_base/Assignment_view.xml             |  5 +---
 .../erp5_base/Assignment_view/my_activity.xml |  5 +---
 .../my_calendar_title_list.xml                |  5 +---
 .../Assignment_view/my_description.xml        |  5 +---
 .../my_destination_project_title.xml          |  5 +---
 .../Assignment_view/my_destination_title.xml  |  5 +---
 .../erp5_base/Assignment_view/my_function.xml |  5 +---
 .../erp5_base/Assignment_view/my_group.xml    |  5 +---
 .../erp5_base/Assignment_view/my_site.xml     |  5 +---
 .../Assignment_view/my_start_date.xml         |  5 +---
 .../Assignment_view/my_stop_date.xml          |  5 +---
 .../erp5_base/Assignment_view/my_title.xml    |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_base/Assignment_viewFieldLibrary.xml |  5 +---
 .../my_activity.xml                           | 10 ++-----
 .../my_calendar_title_list.xml                | 10 ++-----
 .../my_destination_project_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../my_function.xml                           | 10 ++-----
 .../Assignment_viewFieldLibrary/my_group.xml  | 10 ++-----
 .../Assignment_viewFieldLibrary/my_site.xml   | 10 ++-----
 .../my_start_date.xml                         |  5 +---
 .../my_stop_date.xml                          |  5 +---
 .../Assignment_viewFieldLibrary/my_title.xml  |  5 +---
 .../erp5_base/BankAccount_getReference.xml    |  5 +---
 .../erp5_base/BankAccount_view.xml            |  5 +---
 .../erp5_base/BankAccount_view/listbox.xml    |  5 +---
 .../my_bank_account_holder_name.xml           |  5 +---
 .../BankAccount_view/my_bank_account_key.xml  |  5 +---
 .../my_bank_account_number.xml                |  5 +---
 .../BankAccount_view/my_bank_account_type.xml |  5 +---
 .../BankAccount_view/my_bank_code.xml         |  5 +---
 .../BankAccount_view/my_bank_country_code.xml |  5 +---
 .../erp5_base/BankAccount_view/my_branch.xml  |  5 +---
 .../erp5_base/BankAccount_view/my_comment.xml |  5 +---
 .../BankAccount_view/my_description.xml       |  5 +---
 .../my_overdraft_facility.xml                 |  5 +---
 .../BankAccount_view/my_price_currency.xml    |  5 +---
 .../BankAccount_view/my_source_title.xml      |  5 +---
 .../BankAccount_view/my_start_date.xml        |  5 +---
 .../BankAccount_view/my_stop_date.xml         |  5 +---
 .../erp5_base/BankAccount_view/my_title.xml   |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../BankAccount_viewFieldLibrary.xml          |  5 +---
 .../BankAccount_viewFieldLibrary/listbox.xml  |  5 +---
 .../my_bank_account_holder_name.xml           |  5 +---
 .../my_bank_account_key.xml                   |  5 +---
 .../my_bank_account_number.xml                |  5 +---
 .../my_bank_account_type.xml                  |  5 +---
 .../my_bank_code.xml                          |  5 +---
 .../my_bank_country_code.xml                  |  5 +---
 .../my_branch.xml                             |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_overdraft_facility.xml                 |  5 +---
 .../my_source_title.xml                       |  5 +---
 .../my_start_date.xml                         |  5 +---
 .../my_stop_date.xml                          |  5 +---
 .../BankAccount_viewFieldLibrary/my_title.xml |  5 +---
 .../portal_skins/erp5_base/Base_changeId.xml  |  5 +---
 .../Base_convertCurrencyCodeToNumericCode.xml |  5 +---
 .../Base_getDiffBetweenDateAndNow.xml         |  5 +---
 .../erp5_base/Base_getIconAsHTML.xml          |  5 +---
 ...Base_getOrganisationForSectionCategory.xml |  5 +---
 .../erp5_base/Base_getOwnerTitle.xml          |  5 +---
 ...Base_getPreferredCategoryChildItemList.xml |  5 +---
 ...se_getSectionUidListForSectionCategory.xml |  5 +---
 .../erp5_base/Base_initIntIndex.xml           |  5 +---
 .../Base_initIntIndexAndReference.xml         |  5 +---
 .../portal_skins/erp5_base/Base_newQuery.xml  |  5 +---
 .../portal_skins/erp5_base/Base_postQuery.xml |  5 +---
 .../erp5_base/Base_viewChangeIdDialog.xml     |  5 +---
 .../Base_viewChangeIdDialog/your_id.xml       |  5 +---
 .../Base_viewLocalPermissionList.xml          |  5 +---
 .../Base_viewLocalPermissionList/listbox.xml  |  5 +---
 .../listbox_role_name.xml                     |  5 +---
 .../Base_viewLocalPermissionList/my_title.xml |  5 +---
 .../erp5_base/Base_viewPostQueryDialog.xml    |  5 +---
 .../your_description.xml                      |  5 +---
 .../erp5_base/Career_getFunction.xml          |  5 +---
 .../erp5_base/Career_getFunctionItemList.xml  |  5 +---
 .../portal_skins/erp5_base/Career_view.xml    |  5 +---
 .../erp5_base/Career_view/my_activity.xml     |  5 +---
 .../my_collective_agreement_title.xml         |  5 +---
 .../erp5_base/Career_view/my_description.xml  |  5 +---
 .../erp5_base/Career_view/my_function.xml     |  5 +---
 .../erp5_base/Career_view/my_grade.xml        |  5 +---
 .../Career_view/my_product_line_list.xml      |  5 +---
 .../erp5_base/Career_view/my_reference.xml    |  5 +---
 .../erp5_base/Career_view/my_role_list.xml    |  5 +---
 .../Career_view/my_salary_coefficient.xml     |  5 +---
 .../erp5_base/Career_view/my_salary_level.xml |  5 +---
 .../erp5_base/Career_view/my_skill_list.xml   |  5 +---
 .../erp5_base/Career_view/my_start_date.xml   |  5 +---
 .../erp5_base/Career_view/my_stop_date.xml    |  5 +---
 .../Career_view/my_subordination_title.xml    |  5 +---
 .../erp5_base/Career_view/my_title.xml        |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_base/Career_viewFieldLibrary.xml     |  5 +---
 .../Career_viewFieldLibrary/my_activity.xml   | 10 ++-----
 .../my_collective_agreement_title.xml         |  5 +---
 .../Career_viewFieldLibrary/my_function.xml   | 15 ++--------
 .../Career_viewFieldLibrary/my_grade.xml      | 10 ++-----
 .../Career_viewFieldLibrary/my_reference.xml  |  5 +---
 .../Career_viewFieldLibrary/my_role_list.xml  | 10 ++-----
 .../my_salary_coefficient.xml                 |  5 +---
 .../my_salary_level.xml                       | 10 ++-----
 .../Career_viewFieldLibrary/my_skill_list.xml | 10 ++-----
 .../Career_viewFieldLibrary/my_start_date.xml |  5 +---
 .../Career_viewFieldLibrary/my_stop_date.xml  |  5 +---
 .../my_subordination_title.xml                |  5 +---
 .../Career_viewFieldLibrary/my_title.xml      |  5 +---
 .../erp5_base/Coordinate_asURL.xml            |  5 +---
 .../erp5_base/Coordinate_viewFieldLibrary.xml |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_translated_id.xml                      |  5 +---
 .../erp5_base/CreditCard_view.xml             |  5 +---
 .../my_bank_account_holder_name.xml           |  5 +---
 .../CreditCard_view/my_bank_account_key.xml   |  5 +---
 .../my_bank_account_number.xml                |  5 +---
 .../CreditCard_view/my_bank_code.xml          |  5 +---
 .../CreditCard_view/my_description.xml        |  5 +---
 .../CreditCard_view/my_price_currency.xml     |  5 +---
 .../CreditCard_view/my_source_title.xml       |  5 +---
 .../CreditCard_view/my_start_date.xml         |  5 +---
 .../CreditCard_view/my_stop_date.xml          |  5 +---
 .../erp5_base/CreditCard_view/my_title.xml    |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../CurrencyExchange_getExchangeRateList.xml  |  5 +---
 .../CurrencyModule_getCurrencyItemList.xml    |  5 +---
 .../CurrencyModule_viewCurrencyList.xml       |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_base_unit_quantity.xml            | 10 ++-----
 .../erp5_base/Currency_asNumericCode.xml      |  5 +---
 .../portal_skins/erp5_base/Currency_view.xml  |  5 +---
 .../erp5_base/Currency_view/listbox.xml       |  5 +---
 .../Currency_view/listbox_start_date.xml      |  5 +---
 .../Currency_view/listbox_stop_date.xml       |  5 +---
 .../Currency_view/my_base_unit_quantity.xml   |  5 +---
 .../erp5_base/Currency_view/my_reference.xml  |  5 +---
 .../Currency_view/my_short_title.xml          |  5 +---
 .../erp5_base/Currency_view/my_title.xml      |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_base/Currency_viewFieldLibrary.xml   |  5 +---
 .../my_base_unit_quantity.xml                 |  5 +---
 .../my_currency_list.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_short_title.xml                        |  5 +---
 .../my_start_date.xml                         |  5 +---
 .../my_stop_date.xml                          |  5 +---
 .../Currency_viewFieldLibrary/my_title.xml    |  5 +---
 ...DeliveryBuilder_viewPredicateGroupList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../my_id.xml                                 |  5 +---
 .../my_resource_portal_type.xml               |  5 +---
 .../my_title.xml                              |  5 +---
 .../erp5_base/DeliveryBuilder_viewProfile.xml |  5 +---
 ...tion_administration_organisation_title.xml |  5 +---
 ...estination_decision_organisation_title.xml |  5 +---
 .../my_destination_payment_title.xml          |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../my_source_administration_title.xml        |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_payment_title.xml               |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../my_source_title.xml                       |  5 +---
 .../erp5_base/Delivery_acceptDecision.xml     |  5 +---
 .../erp5_base/Delivery_calculate.xml          |  5 +---
 .../Delivery_getCellGroupDivergenceList.xml   |  5 +---
 ...elivery_getDeliveryGroupDivergenceList.xml |  5 +---
 .../Delivery_getLineGroupDivergenceList.xml   |  5 +---
 .../erp5_base/Delivery_getODTDataDict.xml     |  5 +---
 .../Delivery_isSplitAndDeferPossible.xml      |  5 +---
 .../Delivery_solveDivergenceAutomatically.xml |  5 +---
 .../erp5_base/Delivery_updateAppliedRule.xml  |  5 +---
 .../erp5_base/Delivery_updateSimulation.xml   |  5 +---
 .../Delivery_viewSolveDivergenceDialog.xml    |  5 +---
 .../cell_group_listbox.xml                    | 10 ++-----
 .../cell_group_listbox_choice.xml             | 10 ++-----
 .../delivery_group_listbox.xml                | 10 ++-----
 .../delivery_group_listbox_choice.xml         | 10 ++-----
 .../line_group_listbox.xml                    | 10 ++-----
 .../line_group_listbox_choice.xml             | 10 ++-----
 .../your_comment.xml                          |  5 +---
 .../your_workflow_action.xml                  |  5 +---
 .../Delivery_viewSplitAndDeferDialog.xml      |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../listbox_choice.xml                        | 10 ++-----
 .../listbox_prevision_quantity.xml            | 10 ++-----
 .../listbox_quantity_unit.xml                 | 10 ++-----
 .../my_comment.xml                            |  5 +---
 .../my_start_date.xml                         |  5 +---
 .../my_stop_date.xml                          |  5 +---
 .../my_workflow_action.xml                    |  5 +---
 ...cument_checkConversionFormatPermission.xml |  5 +---
 .../Document_getStandardFileName.xml          |  5 +---
 ...5Folder_getUnrestrictedContentTypeList.xml |  5 +---
 ...Site_getAuthenticatedMemberPersonValue.xml |  5 +---
 .../ERP5Type_acquireSecurityFromCategory.xml  |  5 +---
 .../portal_skins/erp5_base/Email_view.xml     |  5 +---
 .../erp5_base/Email_view/my_description.xml   |  5 +---
 .../erp5_base/Email_view/my_int_index.xml     |  5 +---
 .../erp5_base/Email_view/my_title.xml         |  5 +---
 .../erp5_base/Email_view/my_translated_id.xml |  5 +---
 .../erp5_base/Email_view/my_url_string.xml    |  5 +---
 .../erp5_base/Entity_getDefaultEmailAsURL.xml |  5 +---
 .../Entity_getDefaultTelephoneAsURL.xml       |  5 +---
 .../Entity_getMobileTelephoneAsURL.xml        |  5 +---
 .../erp5_base/Entity_viewFieldLibrary.xml     |  5 +---
 .../listbox_int_index.xml                     |  5 +---
 .../Entity_viewFieldLibrary/listbox_title.xml |  5 +---
 .../my_contact_listbox.xml                    |  5 +---
 .../my_product_line_list.xml                  | 10 ++-----
 .../Entity_viewFieldLibrary/my_title.xml      |  5 +---
 .../portal_skins/erp5_base/Event_send.xml     |  5 +---
 .../erp5_base/Event_viewHtmlMimeMessage.xml   |  5 +---
 .../erp5_base/Event_viewMimeMessage.xml       |  5 +---
 .../portal_skins/erp5_base/File_view.xml      |  5 +---
 .../erp5_base/File_view/my_description.xml    |  5 +---
 .../erp5_base/File_view/my_file.xml           |  5 +---
 .../File_view/my_source_reference.xml         |  5 +---
 .../erp5_base/File_view/my_title.xml          |  5 +---
 .../erp5_base/File_viewFieldLibrary.xml       |  5 +---
 .../File_viewFieldLibrary/my_description.xml  |  5 +---
 .../File_viewFieldLibrary/my_file.xml         |  5 +---
 .../my_source_reference.xml                   |  5 +---
 .../File_viewFieldLibrary/my_thumbnail.xml    |  5 +---
 .../File_viewFieldLibrary/my_title.xml        |  5 +---
 .../erp5_base/GeographicAddress_view.xml      |  5 +---
 .../GeographicAddress_view/my_city.xml        |  5 +---
 .../GeographicAddress_view/my_description.xml |  5 +---
 .../GeographicAddress_view/my_int_index.xml   |  5 +---
 .../GeographicAddress_view/my_region.xml      |  5 +---
 .../my_street_address.xml                     |  5 +---
 .../GeographicAddress_view/my_title.xml       |  5 +---
 .../my_translated_id.xml                      |  5 +---
 .../GeographicAddress_view/my_zip_code.xml    |  5 +---
 .../portal_skins/erp5_base/Image_view.xml     |  5 +---
 .../erp5_base/Image_view/my_description.xml   |  5 +---
 .../erp5_base/Image_view/my_file.xml          |  5 +---
 .../Image_view/my_source_reference.xml        |  5 +---
 .../erp5_base/Image_view/my_thumbnail.xml     |  5 +---
 .../erp5_base/Image_view/my_title.xml         |  5 +---
 .../erp5_base/Image_viewFullSizedImage.xml    |  5 +---
 .../my_full_sized_image.xml                   |  5 +---
 .../erp5_base/MappedProperty_view.xml         |  5 +---
 .../MappedProperty_view/my_description.xml    |  5 +---
 .../my_mapping_property_list.xml              | 10 ++-----
 .../MappedProperty_view/my_title.xml          |  5 +---
 .../erp5_base/MovementGroup_view.xml          |  5 +---
 .../my_collect_order_group.xml                |  5 +---
 .../MovementGroup_view/my_description.xml     |  5 +---
 .../my_divergence_scope.xml                   |  5 +---
 .../erp5_base/MovementGroup_view/my_id.xml    |  5 +---
 .../MovementGroup_view/my_int_index.xml       |  5 +---
 .../MovementGroup_view/my_portal_type.xml     |  5 +---
 .../erp5_base/MovementGroup_view/my_title.xml |  5 +---
 .../Movement_getDivergenceListMessage.xml     |  5 +---
 ...sageModule_viewNotificationMessageList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../erp5_base/NotificationMessage_view.xml    |  5 +---
 .../my_aggregate_title_list.xml               | 10 ++-----
 .../my_description.xml                        |  5 +---
 .../my_function_list.xml                      |  5 +---
 .../my_group_list.xml                         |  5 +---
 .../NotificationMessage_view/my_language.xml  |  5 +---
 .../NotificationMessage_view/my_reference.xml |  5 +---
 .../NotificationMessage_view/my_site_list.xml |  5 +---
 .../NotificationMessage_view/my_title.xml     |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../NotificationMessage_view/my_version.xml   |  5 +---
 .../NotificationMessage_viewContentList.xml   |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../my_reference.xml                          |  5 +---
 .../my_title.xml                              |  5 +---
 .../NotificationMessage_viewEditor.xml        |  5 +---
 .../my_content_type.xml                       |  5 +---
 .../my_text_content.xml                       |  5 +---
 ...content_substitution_mapping_method_id.xml |  5 +---
 .../erp5_base/OrderBuilder_view.xml           |  5 +---
 .../erp5_base/OrderBuilder_view/listbox.xml   | 10 ++-----
 .../OrderBuilder_view/listbox_int_index.xml   |  5 +---
 .../listbox_tested_property.xml               | 10 ++-----
 .../listbox_update_always.xml                 | 10 ++-----
 .../OrderBuilder_view/my_comment.xml          |  5 +---
 ...my_delivery_after_generation_script_id.xml |  5 +---
 .../my_delivery_cell_portal_type.xml          |  5 +---
 .../my_delivery_cell_separate_order_list.xml  |  5 +---
 .../my_delivery_line_portal_type.xml          |  5 +---
 .../OrderBuilder_view/my_delivery_module.xml  |  5 +---
 ...ivery_module_before_building_script_id.xml |  5 +---
 .../my_delivery_portal_type.xml               |  5 +---
 .../OrderBuilder_view/my_description.xml      |  5 +---
 .../erp5_base/OrderBuilder_view/my_id.xml     |  5 +---
 .../my_simulation_select_method_id.xml        |  5 +---
 .../erp5_base/OrderBuilder_view/my_title.xml  |  5 +---
 .../erp5_base/OrderBuilder_viewProfile.xml    |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 ...rganisationModule_viewOrganisationList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../OrganisationModule_viewSearchDialog.xml   |  5 +---
 .../my_Description.xml                        |  5 +---
 .../my_Title.xml                              |  5 +---
 .../my_id.xml                                 |  5 +---
 .../erp5_base/Organisation_view.xml           |  5 +---
 .../erp5_base/Organisation_view/listbox.xml   |  5 +---
 .../Organisation_view/my_activity.xml         |  5 +---
 .../Organisation_view/my_corporate_name.xml   |  5 +---
 .../my_default_address_city.xml               |  5 +---
 .../my_default_address_region.xml             |  5 +---
 .../my_default_address_street_address.xml     |  5 +---
 .../my_default_address_zip_code.xml           |  5 +---
 .../my_default_email_text.xml                 |  5 +---
 .../Organisation_view/my_default_fax_text.xml |  5 +---
 .../my_default_telephone_text.xml             |  5 +---
 .../Organisation_view/my_description.xml      |  5 +---
 .../Organisation_view/my_function.xml         |  5 +---
 .../erp5_base/Organisation_view/my_group.xml  |  5 +---
 .../Organisation_view/my_role_list.xml        |  5 +---
 .../erp5_base/Organisation_view/my_site.xml   |  5 +---
 .../erp5_base/Organisation_view/my_title.xml  |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_base/Organisation_viewDetails.xml    |  5 +---
 .../Organisation_viewDetails/listbox.xml      |  5 +---
 .../listbox_int_index.xml                     |  5 +---
 .../listbox_title.xml                         |  5 +---
 .../my_activity_code.xml                      |  5 +---
 .../my_corporate_registration_code.xml        |  5 +---
 .../my_default_image_absolute_url.xml         |  5 +---
 .../my_default_image_file.xml                 |  5 +---
 .../my_ean13_code.xml                         |  5 +---
 .../my_geographic_incorporate_code.xml        |  5 +---
 .../my_skill_list.xml                         |  5 +---
 .../my_social_capital.xml                     |  5 +---
 .../my_social_code.xml                        |  5 +---
 .../my_social_form.xml                        |  5 +---
 .../my_start_date.xml                         |  5 +---
 .../Organisation_viewDetails/my_title.xml     |  5 +---
 .../Organisation_viewDetails/my_vat_code.xml  |  5 +---
 .../Organisation_viewFieldLibrary.xml         |  5 +---
 .../my_activity.xml                           |  5 +---
 .../my_activity_code.xml                      |  5 +---
 .../my_corporate_name.xml                     |  5 +---
 .../my_corporate_registration_code.xml        |  5 +---
 .../my_ean13_code.xml                         |  5 +---
 .../my_economical_class.xml                   |  5 +---
 .../my_function.xml                           | 10 ++-----
 .../my_geographic_incorporate_code.xml        |  5 +---
 .../my_group.xml                              | 10 ++-----
 .../my_role_list.xml                          |  5 +---
 .../Organisation_viewFieldLibrary/my_site.xml | 10 ++-----
 .../my_skill_list.xml                         |  5 +---
 .../my_social_capital.xml                     |  5 +---
 .../my_social_code.xml                        |  5 +---
 .../my_social_form.xml                        |  5 +---
 .../my_start_date.xml                         |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_vat_code.xml                           |  5 +---
 ...anisation_viewFinancialInformationList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_period_list.xml                   | 10 ++-----
 .../listbox_period_list_start_date.xml        |  5 +---
 .../listbox_period_list_stop_date.xml         |  5 +---
 .../listbox_start_date.xml                    |  5 +---
 .../listbox_stop_date.xml                     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 .../PersonModule_viewCareerLogAsHTML.xml      | 15 +++++-----
 .../erp5_base/PersonModule_viewPersonList.xml |  5 +---
 .../PersonModule_viewPersonList/listbox.xml   |  5 +---
 .../erp5_base/Person_afterClone.xml           |  5 +---
 .../erp5_base/Person_generatePassword.xml     |  5 +---
 .../portal_skins/erp5_base/Person_getAge.xml  |  5 +---
 ...Person_getAvailableAssignmentValueList.xml |  5 +---
 .../erp5_base/Person_getCareerStartDate.xml   |  5 +---
 .../Person_getPersonDetailedCareerList.xml    |  5 +---
 ...rson_getPersonDetailedContributionList.xml |  5 +---
 .../Person_getPersonDetailedEventList.xml     |  5 +---
 ...son_getPersonDetailedReportSectionList.xml |  5 +---
 .../erp5_base/Person_getPrimaryGroup.xml      |  5 +---
 .../erp5_base/Person_resetPassword.xml        |  5 +---
 .../Person_sendPasswordNotification.xml       |  5 +---
 .../erp5_base/Person_shiftDefaultCareer.xml   |  5 +---
 ...son_statPersonDetailedContributionList.xml |  5 +---
 .../Person_updateUserSecurityGroup.xml        |  5 +---
 .../Person_validatePasswordsMatch.xml         |  5 +---
 .../portal_skins/erp5_base/Person_view.xml    |  5 +---
 .../erp5_base/Person_view/listbox.xml         |  5 +---
 .../Person_view/listbox_int_index.xml         |  5 +---
 .../erp5_base/Person_view/listbox_title.xml   |  5 +---
 .../Person_view/my_career_activity.xml        |  5 +---
 .../Person_view/my_career_function.xml        |  5 +---
 .../my_career_product_line_list.xml           |  5 +---
 .../Person_view/my_career_role_list.xml       |  5 +---
 .../my_career_subordination_title.xml         |  5 +---
 .../Person_view/my_default_address_city.xml   |  5 +---
 .../Person_view/my_default_address_region.xml |  5 +---
 .../my_default_address_street_address.xml     |  5 +---
 .../my_default_address_zip_code.xml           |  5 +---
 .../Person_view/my_default_email_text.xml     |  5 +---
 .../Person_view/my_default_fax_text.xml       |  5 +---
 .../Person_view/my_default_telephone_text.xml |  5 +---
 .../erp5_base/Person_view/my_description.xml  |  5 +---
 .../erp5_base/Person_view/my_first_name.xml   |  5 +---
 .../erp5_base/Person_view/my_gender.xml       |  5 +---
 .../erp5_base/Person_view/my_last_name.xml    |  5 +---
 .../Person_view/my_mobile_telephone_text.xml  |  5 +---
 .../erp5_base/Person_view/my_nationality.xml  |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_base/Person_viewAssignment.xml       |  5 +---
 .../Person_viewAssignment/listbox.xml         |  5 +---
 .../listbox_start_date.xml                    |  5 +---
 .../listbox_stop_date.xml                     |  5 +---
 .../Person_viewAssignment/my_password.xml     |  5 +---
 .../Person_viewAssignment/my_reference.xml    |  5 +---
 .../Person_viewAssignment/my_title.xml        |  5 +---
 .../password_confirm.xml                      |  5 +---
 .../Person_viewCreateUserActionDialog.xml     |  5 +---
 .../my_workflow_action.xml                    |  5 +---
 .../your_password.xml                         |  5 +---
 .../your_password_confirm.xml                 |  5 +---
 .../your_reference.xml                        |  5 +---
 .../erp5_base/Person_viewDetails.xml          |  5 +---
 .../erp5_base/Person_viewDetails/listbox.xml  |  5 +---
 .../Person_viewDetails/listbox_function.xml   | 15 ++--------
 .../Person_viewDetails/listbox_start_date.xml |  5 +---
 .../Person_viewDetails/listbox_stop_date.xml  |  5 +---
 .../Person_viewDetails/listbox_title.xml      |  5 +---
 .../Person_viewDetails/my_birth_name.xml      |  5 +---
 .../my_career_collective_agreement_title.xml  |  5 +---
 .../Person_viewDetails/my_career_grade.xml    |  5 +---
 .../my_career_reference.xml                   |  5 +---
 .../my_career_salary_coefficient.xml          |  5 +---
 .../my_career_salary_level.xml                |  5 +---
 .../my_career_skill_list.xml                  |  5 +---
 .../Person_viewDetails/my_career_title.xml    |  5 +---
 .../Person_viewDetails/my_child_count.xml     |  5 +---
 .../my_default_birthplace_address_city.xml    |  5 +---
 .../my_default_image_absolute_url.xml         |  5 +---
 .../my_default_image_file.xml                 |  5 +---
 .../Person_viewDetails/my_head_of_family.xml  |  5 +---
 .../Person_viewDetails/my_marital_status.xml  |  5 +---
 .../Person_viewDetails/my_middle_name.xml     |  5 +---
 .../Person_viewDetails/my_partner_count.xml   |  5 +---
 .../Person_viewDetails/my_prefix.xml          |  5 +---
 .../Person_viewDetails/my_social_code.xml     |  5 +---
 .../Person_viewDetails/my_start_date.xml      |  5 +---
 .../Person_viewDetails/my_suffix.xml          |  5 +---
 .../erp5_base/Person_viewDetails/my_title.xml |  5 +---
 .../erp5_base/Person_viewFieldLibrary.xml     |  5 +---
 .../Person_viewFieldLibrary/my_birth_name.xml |  5 +---
 .../my_child_count.xml                        | 15 ++--------
 .../Person_viewFieldLibrary/my_first_name.xml |  5 +---
 .../Person_viewFieldLibrary/my_gender.xml     |  5 +---
 .../my_head_of_family.xml                     |  5 +---
 .../Person_viewFieldLibrary/my_last_name.xml  |  5 +---
 .../my_marital_status.xml                     |  5 +---
 .../my_middle_name.xml                        |  5 +---
 .../my_nationality.xml                        | 10 ++-----
 .../my_partner_count.xml                      | 15 ++--------
 .../Person_viewFieldLibrary/my_password.xml   |  5 +---
 .../Person_viewFieldLibrary/my_prefix.xml     |  5 +---
 .../Person_viewFieldLibrary/my_reference.xml  |  5 +---
 .../Person_viewFieldLibrary/my_start_date.xml |  5 +---
 .../Person_viewFieldLibrary/my_suffix.xml     |  5 +---
 .../Person_viewFieldLibrary/my_title.xml      |  5 +---
 .../Person_viewFinancialInformationList.xml   |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_start_date.xml                    |  5 +---
 .../listbox_stop_date.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 .../Person_viewPersonDetailedCareerList.xml   |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../listbox_start_date.xml                    |  5 +---
 .../listbox_stop_date.xml                     |  5 +---
 .../listbox_title.xml                         |  5 +---
 .../Person_viewPersonDetailedCivilStatus.xml  |  5 +---
 .../my_career_activity.xml                    |  5 +---
 .../my_career_function.xml                    |  5 +---
 .../my_career_product_line_list.xml           |  5 +---
 .../my_career_role_list.xml                   |  5 +---
 .../my_career_subordination_title.xml         |  5 +---
 .../my_default_address_city.xml               |  5 +---
 .../my_default_address_region.xml             |  5 +---
 .../my_default_address_street_address.xml     |  5 +---
 .../my_default_address_zip_code.xml           |  5 +---
 .../my_default_email_text.xml                 |  5 +---
 .../my_default_fax_text.xml                   |  5 +---
 .../my_default_telephone_text.xml             |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_first_name.xml                         |  5 +---
 .../my_gender.xml                             |  5 +---
 .../my_last_name.xml                          |  5 +---
 .../my_mobile_telephone_text.xml              |  5 +---
 .../my_nationality.xml                        |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 ...son_viewPersonDetailedContributionList.xml |  5 +---
 .../listbox.xml                               | 20 +++----------
 .../Person_viewPersonDetailedEventList.xml    |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../listbox_delivery_start_date.xml           |  5 +---
 .../listbox_destination_title.xml             | 10 ++-----
 .../Person_viewPersonDetailedReport.xml       |  5 +---
 .../your_aggregation_level.xml                | 10 ++-----
 .../your_at_date.xml                          |  5 +---
 .../your_from_date.xml                        |  5 +---
 .../your_reportbox.xml                        |  5 +---
 .../Person_viewPersonDetailedReportDialog.xml |  5 +---
 .../your_aggregation_level.xml                |  5 +---
 .../your_at_date.xml                          |  5 +---
 .../your_deferred_style.xml                   |  5 +---
 .../your_format.xml                           |  5 +---
 .../your_from_date.xml                        |  5 +---
 .../your_portal_skin.xml                      |  5 +---
 .../Preference_viewBasePreference.xml         |  5 +---
 ...referred_telephone_default_area_number.xml |  5 +---
 ...referred_telephone_default_city_number.xml |  5 +---
 ...erred_telephone_default_country_number.xml |  5 +---
 .../PropertyAssignmentMovementGroup_view.xml  |  5 +---
 .../my_collect_order_group.xml                |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_divergence_scope.xml                   |  5 +---
 .../my_grouping_method.xml                    |  5 +---
 .../my_id.xml                                 |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_tested_property_list.xml               |  5 +---
 .../my_title.xml                              |  5 +---
 .../erp5_base/PropertyMovementGroup_view.xml  |  5 +---
 .../my_collect_order_group.xml                |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_divergence_scope.xml                   |  5 +---
 .../PropertyMovementGroup_view/my_id.xml      |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_tested_property_list.xml               |  5 +---
 .../PropertyMovementGroup_view/my_title.xml   |  5 +---
 .../my_update_always.xml                      |  5 +---
 .../erp5_base/QueryModule_viewQueryList.xml   |  5 +---
 .../QueryModule_viewQueryList/listbox.xml     |  5 +---
 .../portal_skins/erp5_base/Query_view.xml     |  5 +---
 .../erp5_base/Query_view/my_agent_title.xml   |  5 +---
 .../erp5_base/Query_view/my_description.xml   |  5 +---
 .../erp5_base/Query_view/my_owner.xml         |  5 +---
 .../erp5_base/Query_view/my_text_content.xml  |  5 +---
 .../erp5_base/Query_view/my_title.xml         |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../RoleDefinition_getAgentListAsString.xml   |  5 +---
 .../RoleDefinition_getRoleNameItemList.xml    |  5 +---
 .../erp5_base/RoleDefinition_view.xml         |  5 +---
 .../my_agent_title_list.xml                   |  5 +---
 .../RoleDefinition_view/my_role_name.xml      |  5 +---
 .../RoleDefinition_view/my_title.xml          |  5 +---
 .../RoleDefinition_viewFieldLibrary.xml       |  5 +---
 .../my_agent_title_list.xml                   |  5 +---
 .../my_function.xml                           |  5 +---
 .../my_group.xml                              | 15 ++--------
 .../my_reference.xml                          |  5 +---
 .../my_role_name.xml                          | 10 ++-----
 .../my_site.xml                               | 15 ++--------
 .../RoundingTool_viewRoundingModelList.xml    |  5 +---
 .../listbox.xml                               |  5 +---
 .../erp5_base/SolverDecision_view.xml         |  5 +---
 .../my_causality_title.xml                    | 10 ++-----
 .../SolverDecision_view/my_comment.xml        |  5 +---
 .../my_delivery_title_list.xml                |  5 +---
 .../SolverDecision_view/my_description.xml    |  5 +---
 .../SolverDecision_view/my_solver.xml         | 10 ++-----
 .../SolverDecision_viewConfiguration.xml      |  5 +---
 .../my_configuration.xml                      | 10 ++-----
 .../erp5_base/SolverProcess_view.xml          |  5 +---
 .../erp5_base/SolverProcess_view/listbox.xml  | 10 ++-----
 .../listbox_configuration.xml                 | 10 ++-----
 .../SolverProcess_view/listbox_solver.xml     | 10 ++-----
 .../erp5_base/SolverProcess_view/my_title.xml |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../SolverProcess_view/solver_listbox.xml     | 10 ++-----
 .../solver_listbox_configuration.xml          | 10 ++-----
 .../erp5_base/SolverType_view.xml             |  5 +---
 .../SolverType_view/my_description.xml        |  5 +---
 .../erp5_base/SolverType_view/my_id.xml       |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../my_type_acquire_local_role.xml            |  5 +---
 .../my_type_add_permission.xml                | 10 ++-----
 .../my_type_allowed_content_type_list.xml     |  5 +---
 .../my_type_base_category_list.xml            | 10 ++-----
 .../my_type_factory_method_id.xml             |  5 +---
 .../my_type_filter_content_type.xml           |  5 +---
 .../SolverType_view/my_type_group_list.xml    | 10 ++-----
 .../my_type_hidden_content_type_list.xml      |  5 +---
 .../SolverType_view/my_type_icon.xml          |  5 +---
 .../my_type_init_script_id.xml                |  5 +---
 .../my_type_property_sheet_list.xml           | 10 ++-----
 .../SolverType_viewConfiguration.xml          |  5 +---
 .../my_automatic_solver.xml                   |  5 +---
 .../my_configuration_form_id.xml              |  5 +---
 .../my_configuration_groupable.xml            |  5 +---
 ...iguration_property_list_dict_method_id.xml |  5 +---
 .../my_conflicting_solver_list.xml            | 10 ++-----
 ..._configuration_property_dict_method_id.xml |  5 +---
 .../my_delivery_solver_list.xml               | 10 ++-----
 .../my_line_exclusive.xml                     |  5 +---
 .../my_line_groupable.xml                     |  5 +---
 .../my_process_exclusive.xml                  |  5 +---
 .../my_solver_action_title.xml                |  5 +---
 .../my_tested_property_list.xml               |  5 +---
 ...er_getDefaultConfigurationPropertyDict.xml |  5 +---
 ...etDefaultConfigurationPropertyListDict.xml |  5 +---
 .../portal_skins/erp5_base/Telephone_view.xml |  5 +---
 .../Telephone_view/my_description.xml         |  5 +---
 .../erp5_base/Telephone_view/my_int_index.xml |  5 +---
 .../Telephone_view/my_telephone_area.xml      |  5 +---
 .../Telephone_view/my_telephone_city.xml      |  5 +---
 .../Telephone_view/my_telephone_country.xml   |  5 +---
 .../Telephone_view/my_telephone_extension.xml |  5 +---
 .../Telephone_view/my_telephone_number.xml    |  5 +---
 .../erp5_base/Telephone_view/my_title.xml     |  5 +---
 .../Telephone_view/my_translated_id.xml       |  5 +---
 .../erp5_base/Telephone_viewFieldLibrary.xml  |  5 +---
 .../my_telephone_area.xml                     |  5 +---
 .../my_telephone_city.xml                     |  5 +---
 .../my_telephone_country.xml                  |  5 +---
 .../my_telephone_extension.xml                |  5 +---
 .../my_telephone_number.xml                   |  5 +---
 .../portal_skins/erp5_base/Url_view.xml       |  5 +---
 .../erp5_base/Url_view/my_description.xml     |  5 +---
 .../erp5_base/Url_view/my_int_index.xml       |  5 +---
 .../erp5_base/Url_view/my_title.xml           |  5 +---
 .../erp5_base/Url_view/my_translated_id.xml   |  5 +---
 .../erp5_base/Url_view/my_url_string.xml      |  5 +---
 .../portal_skins/erp5_base/file_icon.gif.xml  |  5 +---
 .../portal_skins/erp5_base/image_icon.gif.xml |  5 +---
 .../openoffice-erp5-objects-template.sxc.xml  |  5 +---
 .../erp5_base/person_icon.gif.xml             |  5 +---
 .../portal_introspections.xml                 |  5 +---
 .../ToolTemplateItem/portal_roundings.xml     |  9 ++----
 .../portal_solver_processes.xml               |  9 ++----
 .../ToolTemplateItem/portal_solvers.xml       |  9 ++----
 .../ToolTemplateItem/portal_web_services.xml  |  5 +---
 .../portal_workflow/assignment_workflow.xml   |  5 +---
 .../assignment_workflow/scripts.xml           |  5 +---
 ...nment_checkActiveAssignmentConsistency.xml |  5 +---
 .../scripts/Assignment_setStopDate.xml        |  5 +---
 .../Assignment_updateUserSecurityGroup.xml    |  5 +---
 .../assignment_workflow/states.xml            |  5 +---
 .../assignment_workflow/states/cancelled.xml  | 10 ++-----
 .../assignment_workflow/states/closed.xml     | 10 ++-----
 .../assignment_workflow/states/deleted.xml    |  5 +---
 .../assignment_workflow/states/draft.xml      |  5 +---
 .../assignment_workflow/states/open.xml       | 10 ++-----
 .../assignment_workflow/states/updated.xml    |  5 +---
 .../assignment_workflow/transitions.xml       |  5 +---
 .../transitions/cancel.xml                    |  5 +---
 .../transitions/cancel_action.xml             | 10 ++-----
 .../assignment_workflow/transitions/close.xml |  5 +---
 .../transitions/close_action.xml              | 10 ++-----
 .../transitions/delete_action.xml             |  5 +---
 .../assignment_workflow/transitions/open.xml  |  5 +---
 .../transitions/open_action.xml               | 10 ++-----
 .../transitions/update.xml                    |  5 +---
 .../transitions/update_action.xml             | 10 ++-----
 .../assignment_workflow/variables.xml         |  5 +---
 .../assignment_workflow/variables/action.xml  |  5 +---
 .../assignment_workflow/variables/actor.xml   |  5 +---
 .../assignment_workflow/variables/comment.xml |  5 +---
 .../variables/error_message.xml               |  5 +---
 .../assignment_workflow/variables/history.xml |  5 +---
 .../assignment_workflow/variables/time.xml    |  5 +---
 .../assignment_workflow/worklists.xml         |  5 +---
 .../portal_workflow/career_workflow.xml       |  5 +---
 .../career_workflow/scripts.xml               |  5 +---
 .../scripts/Career_checkConsistency.xml       |  5 +---
 .../career_workflow/states.xml                |  5 +---
 .../career_workflow/states/cancelled.xml      | 10 ++-----
 .../career_workflow/states/closed.xml         |  5 +---
 .../career_workflow/states/draft.xml          | 10 ++-----
 .../career_workflow/states/open.xml           |  5 +---
 .../career_workflow/transitions.xml           |  5 +---
 .../career_workflow/transitions/cancel.xml    |  5 +---
 .../transitions/cancel_action.xml             | 10 ++-----
 .../career_workflow/transitions/start.xml     |  5 +---
 .../transitions/start_action.xml              | 10 ++-----
 .../career_workflow/transitions/stop.xml      |  5 +---
 .../transitions/stop_action.xml               | 10 ++-----
 .../career_workflow/variables.xml             |  5 +---
 .../career_workflow/variables/action.xml      |  5 +---
 .../career_workflow/variables/actor.xml       |  5 +---
 .../career_workflow/variables/comment.xml     |  5 +---
 .../variables/error_message.xml               |  5 +---
 .../career_workflow/variables/history.xml     |  5 +---
 .../career_workflow/variables/time.xml        |  5 +---
 .../career_workflow/worklists.xml             |  5 +---
 ...ncy_exchange_line_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../CurrencyExchangeLine_edit.xml             |  5 +---
 .../scripts.xml                               |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 ...elivery_causality_interaction_workflow.xml |  5 +---
 .../delivery_causality_workflow.xml           |  5 +---
 .../delivery_causality_workflow/scripts.xml   |  5 +---
 .../scripts/Delivery_afterEdit.xml            |  5 +---
 ...Delivery_callSolveDivergenceTransition.xml |  5 +---
 .../Delivery_callSplitAndDeferTransition.xml  |  5 +---
 .../scripts/Delivery_solveDivergence.xml      |  5 +---
 .../scripts/Delivery_splitAndDefer.xml        |  5 +---
 .../Workflow_solveDivergenceAutomatically.xml |  5 +---
 .../delivery_causality_workflow/states.xml    |  5 +---
 .../states/building.xml                       | 10 ++-----
 .../states/calculating.xml                    | 10 ++-----
 .../states/diverged.xml                       | 10 ++-----
 .../states/draft.xml                          | 10 ++-----
 .../states/solved.xml                         | 10 ++-----
 .../states/solving.xml                        | 10 ++-----
 .../transitions.xml                           |  5 +---
 .../transitions/calculate.xml                 |  5 +---
 .../transitions/converge.xml                  |  5 +---
 .../transitions/diverge.xml                   |  5 +---
 .../transitions/solve_automatically.xml       |  5 +---
 .../transitions/solve_divergence.xml          |  5 +---
 .../transitions/solve_divergence_action.xml   | 15 ++--------
 .../transitions/split_and_defer.xml           |  5 +---
 .../transitions/split_and_defer_action.xml    | 15 ++--------
 .../transitions/start_building.xml            |  5 +---
 .../delivery_causality_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/portal_type.xml                 |  5 +---
 .../variables/time.xml                        |  5 +---
 .../delivery_causality_workflow/worklists.xml |  5 +---
 ...ovement_causality_interaction_workflow.xml |  5 +---
 ...cument_conversion_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../Document_base_convertable.xml             | 15 ++--------
 .../Document_base_convertable_edit.xml        |  5 +---
 .../Document_cached_convertable.xml           |  5 +---
 .../interactions/Document_file.xml            | 15 ++--------
 .../scripts.xml                               |  5 +---
 .../scripts/Document_convertToBaseFormat.xml  |  5 +---
 .../scripts/Document_guessMimeType.xml        |  5 +---
 .../scripts/Document_upload.xml               |  5 +---
 .../scripts/OOoDocument_updateMetadata.xml    |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 ...document_security_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../interactions/DocumentAssignRoles.xml      |  5 +---
 .../interactions/Document_edit.xml            |  5 +---
 .../interactions/Document_setContributor.xml  |  5 +---
 .../scripts.xml                               |  5 +---
 .../scripts/Document_setContributor.xml       |  5 +---
 .../scripts/updateLocalRoles.xml              |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 .../local_permission_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../interactions/UpdateLocalRoles.xml         |  5 +---
 .../UpdateLocalRolesBeforeDelete.xml          |  5 +---
 .../scripts.xml                               |  5 +---
 .../scripts/Parent_updateAllLocalRoles.xml    |  5 +---
 .../RoleDefinition_manageBeforeDelete.xml     |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 ...movement_resource_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../scripts.xml                               |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 .../notification_message_workflow.xml         |  5 +---
 .../notification_message_workflow/scripts.xml |  5 +---
 .../notification_message_workflow/states.xml  |  5 +---
 .../states/deleted.xml                        | 10 ++-----
 .../states/draft.xml                          | 10 ++-----
 .../states/submitted.xml                      | 10 ++-----
 .../states/validated.xml                      | 10 ++-----
 .../transitions.xml                           |  5 +---
 .../transitions/delete.xml                    |  5 +---
 .../transitions/delete_action.xml             | 10 ++-----
 .../transitions/invalidate.xml                |  5 +---
 .../transitions/invalidate_action.xml         | 10 ++-----
 .../transitions/reject.xml                    |  5 +---
 .../transitions/reject_action.xml             | 10 ++-----
 .../transitions/submit.xml                    |  5 +---
 .../transitions/submit_action.xml             | 10 ++-----
 .../transitions/validate.xml                  |  5 +---
 .../transitions/validate_action.xml           | 10 ++-----
 .../variables.xml                             |  5 +---
 .../variables/action.xml                      | 10 ++-----
 .../variables/actor.xml                       | 10 ++-----
 .../variables/comment.xml                     | 10 ++-----
 .../variables/error_message.xml               |  5 +---
 .../variables/history.xml                     | 10 ++-----
 .../variables/portal_type.xml                 |  5 +---
 .../variables/time.xml                        | 10 ++-----
 .../worklists.xml                             |  5 +---
 ...vement_simulation_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../scripts.xml                               |  5 +---
 .../OrderMovement_expandAppliedRule.xml       |  5 +---
 .../OrderMovement_unlinkSimulation.xml        |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 .../order_simulation_interaction_workflow.xml |  5 +---
 .../interactions.xml                          |  5 +---
 .../interactions/expand_simulation.xml        |  5 +---
 .../interactions/reindex_simulation.xml       |  5 +---
 .../scripts.xml                               |  5 +---
 .../scripts/Order_expandAppliedRule.xml       |  5 +---
 .../scripts/Order_reindexAppliedRule.xml      |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 .../person_interaction_workflow.xml           |  5 +---
 .../interactions.xml                          |  5 +---
 ...tentShortCache_onDeleteUserLoginPerson.xml |  5 +---
 ...ShortCache_onRealDeleteUserLoginPerson.xml |  5 +---
 .../interactions/setReference.xml             |  5 +---
 .../person_interaction_workflow/scripts.xml   |  5 +---
 .../scripts/Person_clearContentShortCache.xml |  5 +---
 .../scripts/Person_createUserPreference.xml   |  5 +---
 .../person_interaction_workflow/variables.xml |  5 +---
 .../person_interaction_workflow/worklists.xml |  5 +---
 .../processing_status_workflow.xml            |  5 +---
 .../processing_status_workflow/scripts.xml    |  5 +---
 .../scripts/Document_convertToBaseFormat.xml  |  5 +---
 .../processing_status_workflow/states.xml     |  5 +---
 .../states/conversion_failed.xml              |  5 +---
 .../states/converted.xml                      |  5 +---
 .../states/converting.xml                     |  5 +---
 .../states/empty.xml                          |  5 +---
 .../states/uploaded.xml                       |  5 +---
 .../transitions.xml                           |  5 +---
 .../transitions/conversion_failed.xml         |  5 +---
 .../transitions/convert_action.xml            | 15 ++--------
 .../transitions/convert_file.xml              |  5 +---
 .../transitions/detect_converted_file.xml     | 15 ++--------
 .../transitions/detect_uploaded_file.xml      | 15 ++--------
 .../transitions/process_conversion_failed.xml |  5 +---
 .../transitions/process_file.xml              | 15 ++--------
 .../transitions/update_file_metadata.xml      |  5 +---
 .../transitions/upload_file.xml               |  5 +---
 .../processing_status_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/portal_type.xml                 |  5 +---
 .../variables/serial.xml                      |  5 +---
 .../variables/time.xml                        |  5 +---
 .../processing_status_workflow/worklists.xml  |  5 +---
 .../portal_workflow/query_workflow.xml        |  5 +---
 .../query_workflow/scripts.xml                |  5 +---
 .../query_workflow/scripts/notifyOwner.xml    |  5 +---
 .../portal_workflow/query_workflow/states.xml |  5 +---
 .../query_workflow/states/answered.xml        | 10 ++-----
 .../query_workflow/states/cancelled.xml       | 10 ++-----
 .../query_workflow/states/deleted.xml         |  5 +---
 .../query_workflow/states/draft.xml           |  5 +---
 .../query_workflow/states/posted.xml          |  5 +---
 .../query_workflow/transitions.xml            |  5 +---
 .../query_workflow/transitions/answer.xml     |  5 +---
 .../transitions/answer_action.xml             | 10 ++-----
 .../query_workflow/transitions/cancel.xml     |  5 +---
 .../transitions/cancel_action.xml             | 10 ++-----
 .../query_workflow/transitions/delete.xml     |  5 +---
 .../transitions/delete_action.xml             | 10 ++-----
 .../query_workflow/transitions/post.xml       |  5 +---
 .../transitions/post_action.xml               | 10 ++-----
 .../query_workflow/variables.xml              |  5 +---
 .../query_workflow/variables/action.xml       |  5 +---
 .../query_workflow/variables/actor.xml        |  5 +---
 .../query_workflow/variables/comment.xml      |  5 +---
 .../variables/error_message.xml               |  5 +---
 .../query_workflow/variables/history.xml      |  5 +---
 .../query_workflow/variables/portal_type.xml  |  5 +---
 .../query_workflow/variables/time.xml         |  5 +---
 .../query_workflow/worklists.xml              |  5 +---
 .../query_workflow/worklists/posted.xml       |  5 +---
 .../reindex_object_interaction_workflow.xml   |  5 +---
 .../interactions.xml                          |  5 +---
 .../interactions/doRecursiveReindex.xml       |  5 +---
 .../scripts.xml                               |  5 +---
 .../scripts/callRecursiveReindexObject.xml    |  5 +---
 .../variables.xml                             |  5 +---
 .../worklists.xml                             |  5 +---
 ...ovement_causality_interaction_workflow.xml |  5 +---
 .../solver_process_workflow.xml               |  5 +---
 .../solver_process_workflow/scripts.xml       |  5 +---
 .../solver_process_workflow/states.xml        |  5 +---
 .../solver_process_workflow/states/draft.xml  | 10 ++-----
 .../solver_process_workflow/states/failed.xml | 10 ++-----
 .../solver_process_workflow/states/solved.xml | 10 ++-----
 .../states/solving.xml                        | 10 ++-----
 .../solver_process_workflow/transitions.xml   |  5 +---
 .../transitions/fail.xml                      |  5 +---
 .../transitions/start_solving.xml             |  5 +---
 .../transitions/succeed.xml                   |  5 +---
 .../solver_process_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/portal_type.xml                 |  5 +---
 .../variables/time.xml                        |  5 +---
 .../solver_process_workflow/worklists.xml     |  5 +---
 .../portal_workflow/solver_workflow.xml       |  5 +---
 .../solver_workflow/scripts.xml               |  5 +---
 .../scripts/SolverProcess_startSolving.xml    |  5 +---
 .../scripts/SolverProcess_succeed.xml         |  5 +---
 .../solver_workflow/states.xml                |  5 +---
 .../solver_workflow/states/draft.xml          | 10 ++-----
 .../solver_workflow/states/failed.xml         | 10 ++-----
 .../solver_workflow/states/solved.xml         | 10 ++-----
 .../solver_workflow/states/solving.xml        | 10 ++-----
 .../solver_workflow/transitions.xml           |  5 +---
 .../solver_workflow/transitions/fail.xml      |  5 +---
 .../transitions/start_solving.xml             |  5 +---
 .../solver_workflow/transitions/succeed.xml   |  5 +---
 .../solver_workflow/variables.xml             |  5 +---
 .../solver_workflow/variables/action.xml      |  5 +---
 .../solver_workflow/variables/actor.xml       |  5 +---
 .../solver_workflow/variables/comment.xml     |  5 +---
 .../variables/error_message.xml               |  5 +---
 .../solver_workflow/variables/history.xml     |  5 +---
 .../solver_workflow/variables/portal_type.xml |  5 +---
 .../solver_workflow/variables/time.xml        |  5 +---
 .../solver_workflow/worklists.xml             |  5 +---
 .../portal_workflow/user_account_workflow.xml |  5 +---
 .../user_account_workflow/scripts.xml         |  5 +---
 .../UserAccountWorkflow_createUser.xml        |  5 +---
 ...ccountWorkflow_verifyUserCreationInput.xml |  5 +---
 .../user_account_workflow/states.xml          |  5 +---
 .../user_account_workflow/states/draft.xml    | 10 ++-----
 .../user_account_workflow/transitions.xml     |  5 +---
 .../transitions/create_user_action.xml        | 15 ++--------
 .../user_account_workflow/variables.xml       |  5 +---
 .../variables/action.xml                      |  5 +---
 .../user_account_workflow/variables/actor.xml |  5 +---
 .../variables/comment.xml                     |  5 +---
 .../variables/error_message.xml               |  5 +---
 .../variables/history.xml                     |  5 +---
 .../variables/portal_type.xml                 |  5 +---
 .../user_account_workflow/variables/time.xml  |  5 +---
 .../user_account_workflow/worklists.xml       |  5 +---
 bt5/erp5_base/bt/revision                     |  2 +-
 .../portal_categories/brand.xml               |  9 ++----
 .../portal_categories/cleaning_code.xml       |  9 ++----
 .../portal_categories/collection.xml          |  9 ++----
 .../portal_categories/colour.xml              |  9 ++----
 .../portal_categories/composition.xml         |  9 ++----
 .../portal_categories/feature.xml             |  9 ++----
 .../portal_categories/image.xml               |  9 ++----
 .../portal_categories/measure.xml             |  9 ++----
 .../portal_categories/metric_type.xml         |  9 ++----
 .../portal_categories/morphology.xml          |  9 ++----
 .../portal_categories/operation.xml           |  5 +---
 .../portal_categories/option.xml              |  5 +---
 .../portal_categories/pricing.xml             |  5 +---
 .../portal_categories/segment.xml             |  9 ++----
 .../portal_categories/shape.xml               |  9 ++----
 .../portal_categories/tariff_nomenclature.xml |  5 +---
 .../portal_categories/variation.xml           |  5 +---
 .../portal_categories/visual_pattern.xml      |  9 ++----
 .../Component%20Individual%20Variation.xml    |  5 +---
 .../portal_types/Component%20Module.xml       |  9 +++---
 .../portal_types/Component.xml                |  5 +---
 .../portal_types/Internal%20Supply%20Cell.xml |  5 +---
 .../portal_types/Internal%20Supply%20Line.xml | 15 ++--------
 .../Internal%20Supply%20Module.xml            |  9 +++---
 .../portal_types/Internal%20Supply.xml        | 15 ++--------
 .../portal_types/Measure%20Cell.xml           |  5 +---
 .../portal_types/Measure.xml                  |  5 +---
 .../Product%20Individual%20Variation.xml      |  5 +---
 .../portal_types/Product%20Module.xml         |  9 +++---
 .../portal_types/Product.xml                  | 15 ++--------
 .../portal_types/Purchase%20Supply%20Cell.xml |  5 +---
 .../portal_types/Purchase%20Supply%20Line.xml |  5 +---
 .../Purchase%20Supply%20Module.xml            |  9 +++---
 .../portal_types/Purchase%20Supply.xml        | 15 ++--------
 ...ntity%20Unit%20Conversion%20Definition.xml |  5 +---
 .../Quantity%20Unit%20Conversion%20Group.xml  | 15 ++--------
 .../Quantity%20Unit%20Conversion%20Module.xml | 19 +++++-------
 .../portal_types/Sale%20Supply%20Cell.xml     |  5 +---
 .../portal_types/Sale%20Supply%20Line.xml     |  5 +---
 .../portal_types/Sale%20Supply%20Module.xml   |  9 +++---
 .../portal_types/Sale%20Supply.xml            | 15 ++--------
 .../Service%20Individual%20Variation.xml      |  5 +---
 .../portal_types/Service%20Module.xml         |  9 +++---
 .../portal_types/Service.xml                  |  5 +---
 .../portal_types/Supply%20Cell.xml            |  5 +---
 .../portal_types/Supply%20Line.xml            |  5 +---
 .../portal_types/Transformation%20Module.xml  |  9 +++---
 .../Transformation%20Operation%20Cell.xml     |  5 +---
 .../Transformation%20Operation.xml            | 15 ++--------
 .../Transformation%20Optional%20Resource.xml  | 15 ++--------
 ...mation%20Transformed%20Resource%20Cell.xml |  5 +---
 ...ransformation%20Transformed%20Resource.xml | 15 ++--------
 .../portal_types/Transformation.xml           | 15 ++--------
 .../Amount_hashVariationCategoryItemList.xml  |  5 +---
 .../erp5_pdm/AssortedResource_asCellRange.xml |  5 +---
 ...VariationCategoryTranslatedTitleString.xml |  5 +---
 .../erp5_pdm/Base_validateEan13Code.xml       |  5 +---
 .../ComponentModule_viewComponentList.xml     |  5 +---
 .../listbox.xml                               |  5 +---
 .../portal_skins/erp5_pdm/Component_view.xml  |  5 +---
 .../erp5_pdm/Component_view/listbox.xml       |  5 +---
 .../listbox_variation_base_category.xml       |  5 +---
 .../my_aggregated_portal_type_list.xml        |  5 +---
 .../my_base_contribution_list.xml             | 15 ++--------
 .../Component_view/my_base_height.xml         |  5 +---
 .../Component_view/my_base_length.xml         |  5 +---
 .../Component_view/my_base_volume.xml         |  5 +---
 .../Component_view/my_base_weight.xml         |  5 +---
 .../erp5_pdm/Component_view/my_base_width.xml |  5 +---
 .../erp5_pdm/Component_view/my_comment.xml    |  5 +---
 .../my_default_image_absolute_url.xml         |  5 +---
 .../Component_view/my_default_image_file.xml  |  5 +---
 .../Component_view/my_description.xml         |  5 +---
 .../erp5_pdm/Component_view/my_ean13_code.xml |  5 +---
 .../my_individual_variation_base_category.xml |  5 +---
 ..._optional_variation_base_category_list.xml |  5 +---
 .../Component_view/my_product_line.xml        |  5 +---
 .../Component_view/my_quantity_unit_list.xml  |  5 +---
 .../erp5_pdm/Component_view/my_reference.xml  |  5 +---
 ...y_required_aggregated_portal_type_list.xml |  5 +---
 .../erp5_pdm/Component_view/my_title.xml      |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_pdm/Component_view/my_use_list.xml   | 10 ++-----
 .../my_variation_base_category_list.xml       |  5 +---
 .../my_variation_category_list.xml            | 20 +++----------
 .../erp5_pdm/Consumption_asCellRange.xml      |  5 +---
 .../erp5_pdm/Consumption_print.xml            |  5 +---
 .../erp5_pdm/Consumption_printPdfTemplate.xml | 15 +++++-----
 .../erp5_pdm/Consumption_view.xml             |  5 +---
 .../Consumption_view/my_description.xml       |  5 +---
 .../erp5_pdm/Consumption_view/my_title.xml    |  5 +---
 .../my_variation_base_category.xml            |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 .../erp5_pdm/Consumption_viewQuantity.xml     |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../Consumption_viewQuantity/matrixbox.xml    |  5 +---
 ...box_membership_criterion_category_list.xml |  5 +---
 .../matrixbox_quantity.xml                    |  5 +---
 .../Consumption_viewQuantity/my_title.xml     |  5 +---
 .../ERP5Site_viewPurchaseResourceList.xml     |  5 +---
 .../listbox.xml                               | 15 ++--------
 .../ERP5Site_viewSaleResourceList.xml         |  5 +---
 .../ERP5Site_viewSaleResourceList/listbox.xml | 15 ++--------
 .../portal_skins/erp5_pdm/Image_viewLarge.xml |  5 +---
 .../erp5_pdm/Image_viewLarge/Image_view.xml   |  5 +---
 .../erp5_pdm/IndividualVariation_init.xml     |  5 +---
 .../erp5_pdm/IndividualVariation_view.xml     |  5 +---
 .../IndividualVariation_view/my_title.xml     |  5 +---
 .../my_variation_base_category.xml            |  5 +---
 .../erp5_pdm/InternalSupplyLine_init.xml      |  5 +---
 ...InternalSupplyLine_viewAdditionalPrice.xml |  5 +---
 .../InternalSupplyLine_viewBasePrice.xml      |  5 +---
 .../InternalSupplyLine_viewDiscountRatio.xml  |  5 +---
 ...lSupplyLine_viewExclusiveDiscountRatio.xml |  5 +---
 .../InternalSupplyLine_viewMaxDelay.xml       |  5 +---
 .../InternalSupplyLine_viewMaxFlow.xml        |  5 +---
 .../InternalSupplyLine_viewMaxStock.xml       |  5 +---
 .../InternalSupplyLine_viewMinDelay.xml       |  5 +---
 .../InternalSupplyLine_viewMinFlow.xml        |  5 +---
 .../InternalSupplyLine_viewMinStock.xml       |  5 +---
 ...ine_viewNonDiscountableAdditionalPrice.xml |  5 +---
 .../InternalSupplyLine_viewSurchargeRatio.xml |  5 +---
 ...SupplyLine_viewVariableAdditionalPrice.xml |  5 +---
 ...nalSupplyModule_viewInternalSupplyList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../erp5_pdm/InternalSupply_view.xml          |  5 +---
 .../erp5_pdm/InternalSupply_view/listbox.xml  |  5 +---
 .../InternalSupply_view/my_comment.xml        |  5 +---
 .../InternalSupply_view/my_description.xml    |  5 +---
 .../my_destination_decision_title.xml         |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../InternalSupply_view/my_price_currency.xml |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../InternalSupply_view/my_source_title.xml   |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/InternalSupply_view/my_title.xml |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../portal_skins/erp5_pdm/Measure_view.xml    |  5 +---
 .../erp5_pdm/Measure_view/matrixbox.xml       | 25 ++++------------
 .../matrixbox_predicate_category_list.xml     | 10 ++-----
 .../Measure_view/matrixbox_quantity.xml       | 10 ++-----
 .../Measure_view/my_default_metric_type.xml   |  5 +---
 ...y_measure_variation_base_category_list.xml | 10 ++-----
 .../erp5_pdm/Measure_view/my_metric_type.xml  | 10 ++-----
 .../erp5_pdm/Measure_view/my_quantity.xml     |  5 +---
 .../Measure_view/my_quantity_unit.xml         | 15 ++--------
 .../erp5_pdm/PurchaseSupplyLine_init.xml      |  5 +---
 .../erp5_pdm/PurchaseSupplyLine_view.xml      |  5 +---
 .../my_additional_price.xml                   |  5 +---
 .../PurchaseSupplyLine_view/my_base_price.xml |  5 +---
 .../my_base_unit_price.xml                    |  5 +---
 .../PurchaseSupplyLine_view/my_comment.xml    |  5 +---
 .../my_discount_ratio.xml                     |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 .../PurchaseSupplyLine_view/my_max_delay.xml  |  5 +---
 .../PurchaseSupplyLine_view/my_max_flow.xml   |  5 +---
 .../PurchaseSupplyLine_view/my_max_stock.xml  |  5 +---
 .../PurchaseSupplyLine_view/my_min_delay.xml  |  5 +---
 .../PurchaseSupplyLine_view/my_min_flow.xml   |  5 +---
 .../PurchaseSupplyLine_view/my_min_stock.xml  |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_source_reference.xml                   |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_surcharge_ratio.xml                    |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 ...PurchaseSupplyLine_viewAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_additional_price.xml            | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_additional_price.xml                   |  5 +---
 ...my_additional_price_quantity_step_list.xml | 15 ++--------
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewBasePrice.xml      |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_base_price.xml                  | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_base_price.xml                         |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_step_list.xml                 | 15 ++--------
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewDiscountRatio.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_discount_ratio.xml             | 10 ++-----
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_discount_ratio.xml              | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_discount_ratio.xml                     |  5 +---
 .../my_discount_ratio_quantity_step_list.xml  | 15 ++--------
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 ...eSupplyLine_viewExclusiveDiscountRatio.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_exclusive_discount_ratio.xml   |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_exclusive_discount_ratio.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 ...sive_discount_ratio_quantity_step_list.xml |  5 +---
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMaxDelay.xml       |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_max_delay.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_delay.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMaxFlow.xml        |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_max_flow.xml                    | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_flow.xml                           |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMaxStock.xml       |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_max_stock.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_stock.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMinDelay.xml       |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_min_delay.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_delay.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMinFlow.xml        |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_min_flow.xml                    | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_flow.xml                           |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewMinStock.xml       |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_min_stock.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_stock.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 ...ine_viewNonDiscountableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 ...xbox_non_discountable_additional_price.xml |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../PurchaseSupplyLine_viewSurchargeRatio.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_surcharge_ratio.xml            | 10 ++-----
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_surcharge_ratio.xml             | 10 ++-----
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_surcharge_ratio.xml                    |  5 +---
 .../my_surcharge_ratio_quantity_step_list.xml | 15 ++--------
 ...rge_ratio_variation_base_category_list.xml | 10 ++-----
 ...SupplyLine_viewVariableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variable_additional_price.xml   |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 ...aseSupplyModule_viewPurchaseSupplyList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../erp5_pdm/PurchaseSupply_view.xml          |  5 +---
 .../erp5_pdm/PurchaseSupply_view/listbox.xml  |  5 +---
 .../PurchaseSupply_view/my_comment.xml        |  5 +---
 .../PurchaseSupply_view/my_description.xml    |  5 +---
 .../my_destination_decision_title.xml         |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../PurchaseSupply_view/my_price_currency.xml |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../PurchaseSupply_view/my_source_title.xml   |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/PurchaseSupply_view/my_title.xml |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../PurchaseSupply_viewFieldLibrary.xml       |  5 +---
 .../listbox.xml                               |  5 +---
 .../erp5_pdm/PurchaseSupply_viewProfile.xml   |  5 +---
 .../my_destination_administration_title.xml   |  5 +---
 .../my_destination_carrier_title.xml          |  5 +---
 .../my_destination_decision_title.xml         |  5 +---
 .../my_destination_payment.xml                |  5 +---
 .../my_destination_project_title.xml          |  5 +---
 .../my_destination_reference.xml              |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../my_source_administration_title.xml        |  5 +---
 .../my_source_carrier_title.xml               |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_payment.xml                     |  5 +---
 .../my_source_project_title.xml               |  5 +---
 .../my_source_reference.xml                   |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../my_source_title.xml                       |  5 +---
 .../QuantityUnitConversionDefinition_view.xml |  5 +---
 .../my_inverse.xml                            |  5 +---
 .../my_quantity.xml                           | 10 ++-----
 .../my_quantity_unit.xml                      | 10 ++-----
 .../standard_quantity_unit.xml                | 10 ++-----
 .../QuantityUnitConversionGroup_view.xml      |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_quantity_unit.xml                 |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 ...rsionModule_getUniversalDefinitionDict.xml |  5 +---
 ...dule_invalidateUniversalDefinitionDict.xml |  5 +---
 ...le_viewQuantityUnitConversionGroupList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_quantity_unit.xml                 |  5 +---
 ...tityUnitConversion_getQuantityUnitList.xml |  5 +---
 ...sourceModule_getConvertedInventoryList.xml |  5 +---
 ...sourceModule_getConvertedInventoryStat.xml |  5 +---
 .../erp5_pdm/ResourceModule_getSelection.xml  |  5 +---
 ...ule_viewConvertedInventoryReportDialog.xml |  5 +---
 .../listbox.xml                               | 20 +++----------
 .../your_metric_type.xml                      | 10 ++-----
 .../your_quantity_unit.xml                    | 10 ++-----
 ...viewTransformedResourceInventoryDialog.xml |  5 +---
 .../your_transformed_resource_list.xml        | 10 ++-----
 ...esourceModule_zGetCommonMetricTypeList.xml |  5 +---
 ...Module_zGetQuantityUnitDefinitionRatio.xml |  5 +---
 .../Resource_getDefaultInternalSupplyLine.xml |  5 +---
 .../Resource_getDefaultPurchaseSupplyLine.xml |  5 +---
 .../Resource_getDefaultSaleSupplyLine.xml     |  5 +---
 .../Resource_getDefaultSupplyLine.xml         |  5 +---
 ...ndividualVariationBaseCategoryItemList.xml |  5 +---
 .../Resource_getMovementHistoryStat.xml       |  5 +---
 .../Resource_getMovementedSectionItemList.xml |  5 +---
 ...tOptionalVariationBaseCategoryItemList.xml |  5 +---
 .../erp5_pdm/Resource_getPrice.xml            |  5 +---
 ...esource_getPriceCalculationOperandDict.xml |  5 +---
 .../Resource_getScaledInventoryList.xml       |  5 +---
 ...source_getTransformedResourceInventory.xml |  5 +---
 .../Resource_getVariatedInventoryList.xml     |  5 +---
 ...ource_getVariationBaseCategoryItemList.xml |  5 +---
 .../portal_skins/erp5_pdm/Resource_init.xml   |  5 +---
 .../erp5_pdm/Resource_statInventory.xml       |  5 +---
 ...Resource_viewDefaultInternalSupplyLine.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_base_price.xml                  | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_internal_supply_line_base_price.xml    |  5 +---
 ...y_internal_supply_line_base_unit_price.xml |  5 +---
 .../my_internal_supply_line_comment.xml       |  5 +---
 ...rnal_supply_line_destination_reference.xml |  5 +---
 ...internal_supply_line_destination_title.xml |  5 +---
 .../my_internal_supply_line_max_delay.xml     |  5 +---
 .../my_internal_supply_line_max_flow.xml      |  5 +---
 .../my_internal_supply_line_max_stock.xml     |  5 +---
 .../my_internal_supply_line_min_delay.xml     |  5 +---
 .../my_internal_supply_line_min_flow.xml      |  5 +---
 .../my_internal_supply_line_min_stock.xml     |  5 +---
 ...ly_line_p_variation_base_category_list.xml |  5 +---
 ...my_internal_supply_line_price_currency.xml |  5 +---
 ...y_internal_supply_line_priced_quantity.xml |  5 +---
 ...nternal_supply_line_quantity_step_list.xml |  5 +---
 ...my_internal_supply_line_source_account.xml |  5 +---
 ...ernal_supply_line_start_date_range_max.xml |  5 +---
 ...ernal_supply_line_start_date_range_min.xml |  5 +---
 ...Resource_viewDefaultPurchaseSupplyLine.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_base_price.xml                  | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_purchase_supply_line_base_price.xml    |  5 +---
 ...y_purchase_supply_line_base_unit_price.xml |  5 +---
 .../my_purchase_supply_line_comment.xml       |  5 +---
 ...rchase_supply_line_destination_account.xml |  5 +---
 .../my_purchase_supply_line_max_delay.xml     |  5 +---
 .../my_purchase_supply_line_max_flow.xml      |  5 +---
 .../my_purchase_supply_line_max_stock.xml     |  5 +---
 .../my_purchase_supply_line_min_delay.xml     |  5 +---
 .../my_purchase_supply_line_min_flow.xml      |  5 +---
 .../my_purchase_supply_line_min_stock.xml     |  5 +---
 ...ly_line_p_variation_base_category_list.xml |  5 +---
 ...my_purchase_supply_line_price_currency.xml |  5 +---
 ...y_purchase_supply_line_priced_quantity.xml |  5 +---
 ...urchase_supply_line_quantity_step_list.xml |  5 +---
 ..._purchase_supply_line_source_reference.xml |  5 +---
 .../my_purchase_supply_line_source_title.xml  |  5 +---
 ...chase_supply_line_start_date_range_max.xml |  5 +---
 ...chase_supply_line_start_date_range_min.xml |  5 +---
 .../Resource_viewDefaultSaleSupplyLine.xml    |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_base_price.xml                  | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_sale_supply_line_base_price.xml        |  5 +---
 .../my_sale_supply_line_base_unit_price.xml   |  5 +---
 .../my_sale_supply_line_comment.xml           |  5 +---
 ...sale_supply_line_destination_reference.xml |  5 +---
 .../my_sale_supply_line_destination_title.xml |  5 +---
 .../my_sale_supply_line_max_delay.xml         |  5 +---
 .../my_sale_supply_line_max_flow.xml          |  5 +---
 .../my_sale_supply_line_max_stock.xml         |  5 +---
 .../my_sale_supply_line_min_delay.xml         |  5 +---
 .../my_sale_supply_line_min_flow.xml          |  5 +---
 .../my_sale_supply_line_min_stock.xml         |  5 +---
 ...ly_line_p_variation_base_category_list.xml |  5 +---
 .../my_sale_supply_line_price_currency.xml    |  5 +---
 .../my_sale_supply_line_priced_quantity.xml   |  5 +---
 ...my_sale_supply_line_quantity_step_list.xml |  5 +---
 .../my_sale_supply_line_source_account.xml    |  5 +---
 ..._sale_supply_line_start_date_range_max.xml |  5 +---
 ..._sale_supply_line_start_date_range_min.xml |  5 +---
 ...esource_viewDefaultSupplyLineReference.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             | 20 +++----------
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_reference.xml                   |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_supply_line_start_date_range_max.xml   |  5 +---
 .../Resource_viewDialogFieldLibrary.xml       |  5 +---
 .../your_quantity_unit_list.xml               |  5 +---
 .../my_aggregated_portal_type_list.xml        | 15 ++--------
 .../my_base_height.xml                        |  5 +---
 .../my_base_length.xml                        |  5 +---
 .../my_base_volume.xml                        |  5 +---
 .../my_base_weight.xml                        |  5 +---
 .../my_base_width.xml                         |  5 +---
 .../Resource_viewFieldLibrary/my_comment.xml  |  5 +---
 ...component_individual_variation_listbox.xml |  5 +---
 .../my_component_module_listbox.xml           |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_ean13_code.xml                         | 10 ++-----
 .../my_individual_variation_base_category.xml | 15 ++--------
 ..._optional_variation_base_category_list.xml | 15 ++--------
 ...my_portal_variation_base_category_list.xml | 10 ++-----
 ...y_product_individual_variation_listbox.xml | 10 ++-----
 .../my_product_line.xml                       | 10 ++-----
 .../my_product_module_listbox.xml             |  5 +---
 .../my_quantity_unit_list.xml                 | 10 ++-----
 .../my_reference.xml                          |  5 +---
 ...y_required_aggregated_portal_type_list.xml | 15 ++--------
 ...y_service_individual_variation_listbox.xml |  5 +---
 .../my_service_module_listbox.xml             |  5 +---
 .../Resource_viewFieldLibrary/my_title.xml    |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../my_variation_base_category_list.xml       | 20 +++----------
 .../my_variation_category_list.xml            | 20 +++----------
 .../erp5_pdm/Resource_viewInstructions.xml    |  5 +---
 .../my_instructions.xml                       |  5 +---
 .../erp5_pdm/Resource_viewInventory.xml       |  5 +---
 .../Resource_viewInventory/listbox.xml        | 20 +++----------
 .../listbox_getAvailableInventory.xml         |  5 +---
 .../listbox_getCurrentInventory.xml           |  5 +---
 .../listbox_inventory.xml                     |  5 +---
 .../listbox_variation_category_item_list.xml  | 10 ++-----
 .../Resource_viewInventory/my_title.xml       |  5 +---
 .../erp5_pdm/Resource_viewInventoryChart.xml  |  5 +---
 .../your_at_date.xml                          |  5 +---
 .../your_chart.xml                            |  5 +---
 .../your_from_date.xml                        |  5 +---
 .../your_listbox.xml                          | 10 ++-----
 .../Resource_viewInventoryChart/your_node.xml | 15 ++--------
 .../your_variation_list.xml                   | 10 ++-----
 .../Resource_viewInventoryChartDialog.xml     |  5 +---
 .../your_at_date.xml                          |  5 +---
 .../your_format.xml                           |  5 +---
 .../your_from_date.xml                        |  5 +---
 .../your_node.xml                             | 10 ++-----
 .../your_portal_skin.xml                      |  5 +---
 .../your_variation_list.xml                   | 10 ++-----
 .../Resource_viewInventoryVariationChart.xml  |  5 +---
 .../your_at_date.xml                          |  5 +---
 .../your_chart.xml                            |  5 +---
 .../your_listbox.xml                          | 10 ++-----
 .../your_node.xml                             | 15 ++--------
 ...urce_viewInventoryVariationChartDialog.xml |  5 +---
 .../your_at_date.xml                          |  5 +---
 .../your_format.xml                           |  5 +---
 .../your_node.xml                             | 10 ++-----
 .../your_portal_skin.xml                      |  5 +---
 .../erp5_pdm/Resource_viewMeasure.xml         |  5 +---
 .../erp5_pdm/Resource_viewMeasure/listbox.xml |  5 +---
 .../listbox_default_metric_type.xml           |  5 +---
 .../Resource_viewMeasure/listbox_quantity.xml |  5 +---
 .../listbox_quantity_unit.xml                 | 15 ++--------
 .../my_quantity_unit_list.xml                 |  5 +---
 .../erp5_pdm/Resource_viewMovementHistory.xml |  5 +---
 .../Resource_viewMovementHistory/listbox.xml  | 15 ++--------
 .../listbox_date.xml                          |  5 +---
 .../listbox_total_quantity.xml                |  5 +---
 .../listbox_variation_category_item_list.xml  | 10 ++-----
 .../Resource_viewMovementHistory/my_title.xml |  5 +---
 ...source_viewQuantityUnitConversionGroup.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_quantity_unit.xml                 |  5 +---
 .../Resource_viewRelatedSupplyLineList.xml    |  5 +---
 .../listbox.xml                               | 10 ++-----
 ...ource_viewTransformedResourceInventory.xml |  5 +---
 .../listbox.xml                               | 15 ++--------
 .../listbox_inventory.xml                     |  5 +---
 .../listbox_transformed_variation_text.xml    | 10 ++-----
 .../listbox_variation_text.xml                | 10 ++-----
 ...viewTransformedResourceInventoryDialog.xml |  5 +---
 .../your_transformed_resource_list.xml        | 10 ++-----
 .../Resource_zGetTransformedResourceList.xml  |  5 +---
 .../Resource_zGetTransformedResourceRatio.xml |  5 +---
 .../erp5_pdm/SaleSupplyLine_init.xml          |  5 +---
 .../erp5_pdm/SaleSupplyLine_view.xml          |  5 +---
 .../my_additional_price.xml                   |  5 +---
 .../SaleSupplyLine_view/my_base_price.xml     |  5 +---
 .../my_base_unit_price.xml                    |  5 +---
 .../SaleSupplyLine_view/my_comment.xml        |  5 +---
 .../my_destination_reference.xml              |  5 +---
 .../SaleSupplyLine_view/my_discount_ratio.xml |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 .../SaleSupplyLine_view/my_price_currency.xml |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../SaleSupplyLine_view/my_quantity_unit.xml  |  5 +---
 .../SaleSupplyLine_view/my_resource_title.xml |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_surcharge_ratio.xml                    |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 .../SaleSupplyLine_viewAdditionalPrice.xml    |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_additional_price.xml            | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_additional_price.xml                   |  5 +---
 ...my_additional_price_quantity_step_list.xml | 15 ++--------
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewBasePrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_base_price.xml                  | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_base_price.xml                         |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_step_list.xml                 | 15 ++--------
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../SaleSupplyLine_viewDiscountRatio.xml      |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_discount_ratio.xml             | 10 ++-----
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_discount_ratio.xml              | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_discount_ratio.xml                     |  5 +---
 .../my_discount_ratio_quantity_step_list.xml  | 10 ++-----
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 ...eSupplyLine_viewExclusiveDiscountRatio.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_exclusive_discount_ratio.xml   |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_exclusive_discount_ratio.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 ...sive_discount_ratio_quantity_step_list.xml |  5 +---
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMaxDelay.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMaxDelay/matrixbox.xml |  5 +---
 .../matrixbox_max_delay.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_delay.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMaxFlow.xml   |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMaxFlow/matrixbox.xml  |  5 +---
 .../matrixbox_max_flow.xml                    | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_flow.xml                           |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMaxStock.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMaxStock/matrixbox.xml |  5 +---
 .../matrixbox_max_stock.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_max_stock.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMinDelay.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMinDelay/matrixbox.xml |  5 +---
 .../matrixbox_min_delay.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_delay.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMinFlow.xml   |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMinFlow/matrixbox.xml  |  5 +---
 .../matrixbox_min_flow.xml                    | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_flow.xml                           |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupplyLine_viewMinStock.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SaleSupplyLine_viewMinStock/matrixbox.xml |  5 +---
 .../matrixbox_min_stock.xml                   | 10 ++-----
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_min_stock.xml                          |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 ...ine_viewNonDiscountableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 ...xbox_non_discountable_additional_price.xml |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../SaleSupplyLine_viewSurchargeRatio.xml     |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_surcharge_ratio.xml            | 10 ++-----
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_surcharge_ratio.xml             | 10 ++-----
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_surcharge_ratio.xml                    |  5 +---
 .../my_surcharge_ratio_quantity_step_list.xml | 15 ++--------
 ...rge_ratio_variation_base_category_list.xml | 10 ++-----
 ...SupplyLine_viewVariableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variable_additional_price.xml   |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 .../SaleSupplyModule_viewSaleSupplyList.xml   |  5 +---
 .../listbox.xml                               |  5 +---
 .../portal_skins/erp5_pdm/SaleSupply_view.xml |  5 +---
 .../erp5_pdm/SaleSupply_view/listbox.xml      |  5 +---
 .../erp5_pdm/SaleSupply_view/my_comment.xml   |  5 +---
 .../SaleSupply_view/my_description.xml        |  5 +---
 .../my_destination_decision_title.xml         |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../SaleSupply_view/my_destination_title.xml  |  5 +---
 .../SaleSupply_view/my_price_currency.xml     |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../SaleSupply_view/my_source_title.xml       |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_start_date_range_min.xml               |  5 +---
 .../erp5_pdm/SaleSupply_view/my_title.xml     |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_pdm/SaleSupply_viewFieldLibrary.xml  |  5 +---
 .../SaleSupply_viewFieldLibrary/listbox.xml   |  5 +---
 .../erp5_pdm/SaleSupply_viewProfile.xml       |  5 +---
 .../my_destination_administration_title.xml   |  5 +---
 .../my_destination_carrier_title.xml          |  5 +---
 .../my_destination_decision_title.xml         |  5 +---
 .../my_destination_payment.xml                |  5 +---
 .../my_destination_project_title.xml          |  5 +---
 .../my_destination_reference.xml              |  5 +---
 .../my_destination_section_title.xml          |  5 +---
 .../my_destination_title.xml                  |  5 +---
 .../my_source_administration_title.xml        |  5 +---
 .../my_source_carrier_title.xml               |  5 +---
 .../my_source_decision_title.xml              |  5 +---
 .../my_source_payment.xml                     |  5 +---
 .../my_source_project_title.xml               |  5 +---
 .../my_source_reference.xml                   |  5 +---
 .../my_source_section_title.xml               |  5 +---
 .../my_source_title.xml                       |  5 +---
 .../ServiceModule_viewServiceList.xml         |  5 +---
 .../ServiceModule_viewServiceList/listbox.xml |  5 +---
 .../portal_skins/erp5_pdm/Service_view.xml    |  5 +---
 .../erp5_pdm/Service_view/listbox.xml         |  5 +---
 .../listbox_variation_base_category.xml       |  5 +---
 .../my_aggregated_portal_type_list.xml        |  5 +---
 .../my_base_contribution_list.xml             | 15 ++--------
 .../erp5_pdm/Service_view/my_comment.xml      |  5 +---
 .../erp5_pdm/Service_view/my_description.xml  |  5 +---
 .../my_individual_variation_base_category.xml |  5 +---
 ..._optional_variation_base_category_list.xml |  5 +---
 .../erp5_pdm/Service_view/my_product_line.xml |  5 +---
 .../Service_view/my_quantity_unit_list.xml    |  5 +---
 .../erp5_pdm/Service_view/my_reference.xml    |  5 +---
 ...y_required_aggregated_portal_type_list.xml |  5 +---
 .../erp5_pdm/Service_view/my_title.xml        |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_pdm/Service_view/my_use_list.xml     | 10 ++-----
 .../my_variation_base_category_list.xml       |  5 +---
 .../my_variation_category_list.xml            | 20 +++----------
 .../erp5_pdm/SupplyCell_asPredicate.xml       |  5 +---
 ...pplyCell_getLocalPredicatePropertyDict.xml |  5 +---
 .../erp5_pdm/SupplyLine_asCellRange.xml       |  5 +---
 .../SupplyLine_asOptionVariationCellRange.xml |  5 +---
 .../erp5_pdm/SupplyLine_asPredicate.xml       |  5 +---
 .../portal_skins/erp5_pdm/SupplyLine_init.xml |  5 +---
 .../SupplyLine_validateQuantityStepList.xml   |  5 +---
 .../portal_skins/erp5_pdm/SupplyLine_view.xml |  5 +---
 .../SupplyLine_view/my_additional_price.xml   |  5 +---
 .../SupplyLine_view/my_base_price.xml         |  5 +---
 .../erp5_pdm/SupplyLine_view/my_comment.xml   |  5 +---
 .../SupplyLine_view/my_discount_ratio.xml     |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 .../SupplyLine_view/my_price_currency.xml     |  5 +---
 .../SupplyLine_view/my_priced_quantity.xml    |  5 +---
 .../SupplyLine_view/my_quantity_unit.xml      |  5 +---
 .../SupplyLine_view/my_resource_title.xml     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../SupplyLine_view/my_surcharge_ratio.xml    |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 .../SupplyLine_viewAdditionalPrice.xml        |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_additional_price.xml            |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_additional_price.xml                   |  5 +---
 ...my_additional_price_quantity_step_list.xml |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../erp5_pdm/SupplyLine_viewBasePrice.xml     |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SupplyLine_viewBasePrice/matrixbox.xml    |  5 +---
 .../matrixbox_base_price.xml                  |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_base_price.xml                         |  5 +---
 .../my_p_variation_base_category_list.xml     | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_step_list.xml                 | 15 ++--------
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../erp5_pdm/SupplyLine_viewDiscountRatio.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_discount_ratio.xml             |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_discount_ratio.xml              |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_discount_ratio.xml                     |  5 +---
 .../my_discount_ratio_quantity_step_list.xml  |  5 +---
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../SupplyLine_viewExclusiveDiscountRatio.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_exclusive_discount_ratio.xml   |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_exclusive_discount_ratio.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_exclusive_discount_ratio.xml           |  5 +---
 ...sive_discount_ratio_quantity_step_list.xml |  5 +---
 ...unt_ratio_variation_base_category_list.xml | 10 ++-----
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 ...ine_viewNonDiscountableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 ...xbox_non_discountable_additional_price.xml |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_non_discountable_additional_price.xml  |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../erp5_pdm/SupplyLine_viewReference.xml     |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../SupplyLine_viewReference/matrixbox.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_reference.xml                   |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../SupplyLine_viewReference/my_comment.xml   |  5 +---
 .../my_supply_line_start_date_range_max.xml   |  5 +---
 .../SupplyLine_viewSurchargeRatio.xml         |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox1.xml                            |  5 +---
 .../matrixbox1_predicate_category_list.xml    |  5 +---
 .../matrixbox1_surcharge_ratio.xml            |  5 +---
 .../matrixbox1_variation_category_list.xml    |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_surcharge_ratio.xml             |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_surcharge_ratio.xml                    |  5 +---
 .../my_surcharge_ratio_quantity_step_list.xml |  5 +---
 ...rge_ratio_variation_base_category_list.xml | 10 ++-----
 ...SupplyLine_viewVariableAdditionalPrice.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_predicate_category_list.xml     |  5 +---
 .../matrixbox_variable_additional_price.xml   |  5 +---
 .../matrixbox_variation_category_list.xml     |  5 +---
 .../my_price_currency.xml                     |  5 +---
 .../my_priced_quantity.xml                    |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../my_variable_additional_price.xml          |  5 +---
 ...le_additional_price_quantity_step_list.xml |  5 +---
 .../erp5_pdm/SupplyModule_viewSupplyList.xml  |  5 +---
 .../SupplyModule_viewSupplyList/listbox.xml   |  5 +---
 .../portal_skins/erp5_pdm/Supply_view.xml     |  5 +---
 .../erp5_pdm/Supply_view/listbox.xml          |  5 +---
 .../erp5_pdm/Supply_view/my_description.xml   |  5 +---
 .../Supply_view/my_destination_title.xml      |  5 +---
 .../Supply_view/my_price_currency.xml         |  5 +---
 .../my_source_administration_title.xml        |  5 +---
 .../Supply_view/my_source_section.xml         |  5 +---
 .../Supply_view/my_start_date_range_max.xml   |  5 +---
 .../Supply_view/my_start_date_range_min.xml   |  5 +---
 .../erp5_pdm/Supply_view/my_title.xml         |  5 +---
 .../erp5_pdm/Supply_viewFieldLibrary.xml      |  5 +---
 .../Supply_viewFieldLibrary/my_comment.xml    |  5 +---
 .../my_destination_account.xml                | 15 ++--------
 .../my_destination_title.xml                  |  5 +---
 .../my_mapped_value_property_list.xml         |  5 +---
 .../my_matrixbox_base_price.xml               | 10 ++-----
 .../my_matrixbox_predicate_category_list.xml  |  5 +---
 .../my_matrixbox_variation_category_list.xml  |  5 +---
 .../Supply_viewFieldLibrary/my_max_delay.xml  |  5 +---
 .../Supply_viewFieldLibrary/my_min_delay.xml  |  5 +---
 .../Supply_viewFieldLibrary/my_min_flow.xml   |  5 +---
 .../my_p_variation_base_category_list.xml     | 15 ++--------
 .../my_price_currency.xml                     | 10 ++-----
 .../my_priced_quantity.xml                    |  5 +---
 .../my_purchase_base_price.xml                |  5 +---
 .../my_purchase_matrixbox.xml                 |  5 +---
 .../my_purchase_quantity_step_list.xml        | 10 ++-----
 .../my_purchase_reference.xml                 |  5 +---
 .../my_sale_base_price.xml                    |  5 +---
 .../my_sale_matrixbox.xml                     | 20 +++----------
 .../my_sale_quantity_step_list.xml            | 15 ++--------
 .../my_sale_reference.xml                     |  5 +---
 .../my_source_account.xml                     | 15 ++--------
 .../my_source_title.xml                       |  5 +---
 .../my_start_date_range_max.xml               |  5 +---
 .../SystemPreference_viewResourceData.xml     |  5 +---
 ...formationModule_viewTransformationList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../TransformationOperation_afterClone.xml    |  5 +---
 .../erp5_pdm/TransformationOperation_view.xml |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_specialise_title.xml                   |  5 +---
 .../TransformationOperation_view/my_title.xml |  5 +---
 ...ansformationOperation_viewFieldLibrary.xml |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_q_variation_base_category_list.xml     |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_matrixbox.xml                 |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     | 15 ++--------
 .../my_specialise_title.xml                   |  5 +---
 .../my_specialise_title_list.xml              |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_v_variation_base_category_list.xml     |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 .../my_variation_matrixbox.xml                |  5 +---
 .../TransformationOperation_viewQuantity.xml  |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 ...box_membership_criterion_category_list.xml |  5 +---
 .../matrixbox_quantity.xml                    | 10 ++-----
 ...embership_criterion_base_category_list.xml |  5 +---
 .../my_q_variation_base_category_list.xml     |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_specialise_title_list.xml              |  5 +---
 .../my_title.xml                              |  5 +---
 .../TransformationOperation_viewVariation.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_category_list.xml               | 15 ++--------
 ...box_membership_criterion_category_list.xml | 10 ++-----
 ...embership_criterion_base_category_list.xml |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_v_variation_base_category_list.xml     |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 ...nsformationOptionalResource_afterClone.xml |  5 +---
 ...sformationOptionalResource_asPredicate.xml |  5 +---
 .../TransformationOptionalResource_view.xml   |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_option.xml                             |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     | 10 ++-----
 .../my_specialise_title.xml                   |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 ...ationOptionalResource_viewFieldLibrary.xml |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_option.xml                             | 10 ++-----
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_specialise_title.xml                   |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 ...ormationTransformedResource_afterClone.xml |  5 +---
 ...TransformationTransformedResource_view.xml |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   |  5 +---
 .../my_int_index.xml                          |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_specialise_title.xml                   |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 ...onTransformedResource_viewFieldLibrary.xml |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_efficiency.xml                         |  5 +---
 .../my_industrial_phase.xml                   | 10 ++-----
 .../my_int_index.xml                          |  5 +---
 .../my_q_variation_base_category_list.xml     | 10 ++-----
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_matrixbox.xml                 |  5 +---
 .../my_quantity_unit.xml                      | 10 ++-----
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     | 15 ++--------
 .../my_specialise_title.xml                   |  5 +---
 .../my_specialise_title_list.xml              |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_v_variation_base_category_list.xml     | 10 ++-----
 .../my_variation_category_list.xml            | 10 ++-----
 .../my_variation_matrixbox.xml                |  5 +---
 ...mationTransformedResource_viewQuantity.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 ...box_membership_criterion_category_list.xml |  5 +---
 .../matrixbox_quantity.xml                    | 10 ++-----
 ...embership_criterion_base_category_list.xml |  5 +---
 .../my_q_variation_base_category_list.xml     |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_unit.xml                      |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_specialise_title_list.xml              |  5 +---
 .../my_title.xml                              |  5 +---
 ...ationTransformedResource_viewVariation.xml |  5 +---
 .../mapped_value_property_list.xml            |  5 +---
 .../matrixbox.xml                             |  5 +---
 .../matrixbox_category_list.xml               | 15 ++--------
 ...box_membership_criterion_category_list.xml | 10 ++-----
 ...embership_criterion_base_category_list.xml |  5 +---
 .../my_resource_title.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 .../my_v_variation_base_category_list.xml     |  5 +---
 .../my_variation_category_list.xml            |  5 +---
 ...Transformation_getAggregatedAmountList.xml |  5 +---
 .../Transformation_getReportSectionList.xml   |  5 +---
 .../Transformation_getTotalDuration.xml       |  5 +---
 .../erp5_pdm/Transformation_getTotalPrice.xml |  5 +---
 ...sformation_updateVariationCategoryList.xml |  5 +---
 .../erp5_pdm/Transformation_view.xml          |  5 +---
 .../erp5_pdm/Transformation_view/listbox.xml  |  5 +---
 .../listbox_efficiency.xml                    | 10 ++-----
 .../listbox_industrial_phase.xml              | 15 ++--------
 .../Transformation_view/listbox_int_index.xml |  5 +---
 .../Transformation_view/listbox_quantity.xml  |  5 +---
 .../listbox_quantity_unit.xml                 | 10 ++-----
 .../Transformation_view/listbox_reference.xml |  5 +---
 .../Transformation_view/my_comment.xml        |  5 +---
 .../Transformation_view/my_description.xml    |  5 +---
 .../Transformation_view/my_reference.xml      |  5 +---
 .../Transformation_view/my_resource_title.xml |  5 +---
 .../my_template_transformation_title_list.xml |  5 +---
 .../erp5_pdm/Transformation_view/my_title.xml |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../my_variation_base_category_list.xml       |  5 +---
 .../Transformation_view/my_version.xml        |  5 +---
 .../erp5_pdm/Transformation_viewExpanded.xml  |  5 +---
 .../Transformation_viewExpanded/listbox.xml   | 15 ++--------
 .../listbox_converted_quantity.xml            |  5 +---
 .../listbox_efficiency.xml                    | 10 ++-----
 .../listbox_getResourcePrice.xml              |  5 +---
 .../listbox_getTotalPrice.xml                 |  5 +---
 .../listbox_quantity.xml                      |  5 +---
 ...listbox_resource_default_quantity_unit.xml | 10 ++-----
 .../reference_variation_category_list.xml     | 15 ++--------
 .../Transformation_viewFieldLibrary.xml       |  5 +---
 .../my_comment.xml                            |  5 +---
 .../my_description.xml                        |  5 +---
 .../my_reference.xml                          |  5 +---
 .../my_resource_title.xml                     | 15 ++--------
 .../my_template_transformation_title_list.xml |  5 +---
 .../my_title.xml                              |  5 +---
 ...my_transformation_content_list_listbox.xml |  5 +---
 .../my_translated_validation_state_title.xml  |  5 +---
 .../my_variation_base_category_list.xml       | 10 ++-----
 .../Transformation_viewGlobalReport.xml       |  5 +---
 .../my_title.xml                              |  5 +---
 .../your_reportbox.xml                        |  5 +---
 .../Transformation_viewGlobalReportDialog.xml |  5 +---
 .../your_format.xml                           |  5 +---
 .../your_portal_skin.xml                      |  5 +---
 .../your_price_currency.xml                   | 10 ++-----
 .../your_variation_category_list.xml          | 10 ++-----
 ...mation_viewTransformationOperationList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_efficiency.xml                    |  5 +---
 .../listbox_int_index.xml                     |  5 +---
 .../listbox_quantity.xml                      |  5 +---
 .../listbox_quantity_unit.xml                 | 10 ++-----
 .../listbox_reference.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 ...viewTransformationOptionalResourceList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_efficiency.xml                    |  5 +---
 .../listbox_int_index.xml                     |  5 +---
 .../listbox_quantity.xml                      |  5 +---
 .../listbox_quantity_unit.xml                 | 10 ++-----
 .../listbox_reference.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 ...wTransformationTransformedResourceList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../listbox_efficiency.xml                    | 10 ++-----
 .../listbox_int_index.xml                     |  5 +---
 .../listbox_quantity.xml                      |  5 +---
 .../listbox_quantity_unit.xml                 | 10 ++-----
 .../listbox_reference.xml                     |  5 +---
 .../my_title.xml                              |  5 +---
 .../TransformedResource_asCellRange.xml       |  5 +---
 ...sformedResource_completeQuantityMatrix.xml |  5 +---
 ...medResource_completeQuantityMatrixForm.xml |  5 +---
 .../my_reference_quantity.xml                 |  5 +---
 .../my_reference_variation_category_list.xml  |  5 +---
 ...formedResource_completeVariationMatrix.xml |  5 +---
 ...Resource_hashVariationCategoryItemList.xml |  5 +---
 bt5/erp5_pdm/bt/revision                      |  2 +-
 .../configuration.xml                         | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../configuration.xml                         | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../DateTime%20Divergence%20Tester/view.xml   | 10 ++-----
 .../configuration.xml                         | 10 ++-----
 .../Float%20Divergence%20Tester/predicate.xml | 10 ++-----
 .../Float%20Divergence%20Tester/view.xml      | 10 ++-----
 .../configuration.xml                         | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../view.xml                                  | 10 ++-----
 .../Solver%20Decision/configuration.xml       | 15 ++--------
 .../portal_types/Solver%20Decision/view.xml   | 10 ++-----
 .../Solver%20Process%20Tool/view.xml          | 10 ++-----
 .../portal_types/Solver%20Process/view.xml    | 10 ++-----
 .../portal_types/Solver%20Tool/view.xml       | 10 ++-----
 .../Solver%20Type/action_view.xml             | 10 ++-----
 .../Solver%20Type/predicate_view.xml          | 10 ++-----
 .../portal_types/Solver%20Type/role_view.xml  | 10 ++-----
 .../Solver%20Type/solver_view.xml             | 10 ++-----
 .../Solver%20Type/translation_view.xml        | 10 ++-----
 .../Solver%20Type/update_local_roles.xml      | 10 ++-----
 .../portal_types/Solver%20Type/view.xml       | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../Specialise%20Divergence%20Tester/view.xml | 10 ++-----
 .../configuration.xml                         | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../String%20Divergence%20Tester/view.xml     | 10 ++-----
 .../configuration.xml                         | 10 ++-----
 .../predicate.xml                             | 10 ++-----
 .../Variation%20Divergence%20Tester/view.xml  | 10 ++-----
 ...ory%20Membership%20Divergence%20Tester.xml | 15 ++--------
 .../DateTime%20Divergence%20Tester.xml        | 15 ++--------
 .../Float%20Divergence%20Tester.xml           |  5 +---
 ...erted%20Quantity%20Divergence%20Tester.xml | 15 ++--------
 .../portal_types/Solver%20Decision.xml        | 15 ++--------
 .../portal_types/Solver%20Process%20Tool.xml  | 15 ++--------
 .../portal_types/Solver%20Process.xml         | 15 ++--------
 .../portal_types/Solver%20Tool.xml            | 15 ++--------
 .../portal_types/Solver%20Type.xml            | 15 ++--------
 .../Specialise%20Divergence%20Tester.xml      | 15 ++--------
 .../String%20Divergence%20Tester.xml          |  5 +---
 .../Variation%20Divergence%20Tester.xml       |  5 +---
 .../portal_skins/erp5_simulation.xml          |  5 +---
 .../Base_editConfiguration.xml                |  5 +---
 ...shipDivergenceTester_viewConfiguration.xml |  5 +---
 .../my_tested_property.xml                    |  5 +---
 .../my_tested_property_title.xml              |  5 +---
 ...TimeDivergenceTester_viewConfiguration.xml |  5 +---
 .../my_quantity.xml                           |  5 +---
 .../my_quantity_range_max.xml                 |  5 +---
 .../my_quantity_range_min.xml                 |  5 +---
 .../my_tested_property.xml                    |  5 +---
 .../my_tested_property_title.xml              |  5 +---
 .../Delivery_getSolverDecisionList.xml        |  5 +---
 .../Delivery_submitSolveDivergenceDialog.xml  |  5 +---
 .../Delivery_updateSolveDivergenceDialog.xml  |  5 +---
 .../Delivery_viewSolveDivergenceDialog.xml    |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../listbox_comment.xml                       |  5 +---
 .../listbox_divergence.xml                    | 10 ++-----
 .../listbox_solver.xml                        | 15 ++--------
 .../listbox_solver_configuration.xml          | 15 ++--------
 .../your_workflow_action.xml                  |  5 +---
 ...loatDivergenceTester_viewConfiguration.xml |  5 +---
 .../my_decimal_alignment_enabled.xml          |  5 +---
 .../my_decimal_exponent.xml                   |  5 +---
 .../my_decimal_rounding_option.xml            | 10 ++-----
 .../my_quantity_range_max.xml                 |  5 +---
 .../my_quantity_range_min.xml                 |  5 +---
 .../my_tested_property.xml                    |  5 +---
 .../my_tested_property_title.xml              |  5 +---
 .../my_tolerance_base.xml                     |  5 +---
 .../my_tolerance_range_max.xml                |  5 +---
 .../my_tolerance_range_min.xml                |  5 +---
 ...tySplitSolver_viewConfigurationFormBox.xml |  5 +---
 .../my_delivery_solver.xml                    | 20 +++----------
 .../my_start_date.xml                         | 15 ++--------
 .../my_stop_date.xml                          | 15 ++--------
 .../erp5_simulation/Rule_testFalse.xml        |  5 +---
 .../erp5_simulation/Rule_view.xml             |  5 +---
 .../erp5_simulation/Rule_view/listbox.xml     | 10 ++-----
 .../Rule_view/listbox_divergence_provider.xml | 10 ++-----
 .../Rule_view/listbox_matching_provider.xml   | 10 ++-----
 .../listbox_tested_property_list.xml          |  5 +---
 .../Rule_view/listbox_updating_provider.xml   | 10 ++-----
 .../Rule_view/mapped_property_listbox.xml     |  5 +---
 ...property_listbox_mapping_property_list.xml |  5 +---
 .../Rule_view/my_description.xml              |  5 +---
 .../Rule_view/my_reference.xml                |  5 +---
 .../Rule_view/my_start_date_range_max.xml     |  5 +---
 .../Rule_view/my_start_date_range_min.xml     |  5 +---
 .../Rule_view/my_test_method_id.xml           |  5 +---
 .../erp5_simulation/Rule_view/my_title.xml    |  5 +---
 .../Rule_view/my_trade_phase_list.xml         | 10 ++-----
 .../my_translated_validation_state_title.xml  |  5 +---
 .../erp5_simulation/Rule_view/my_version.xml  |  5 +---
 .../SolverDecision_getDeliverySolverList.xml  |  5 +---
 ...olverDecision_getDivergenceDescription.xml |  5 +---
 .../SolverProcess_viewDeliverySolverList.xml  |  5 +---
 .../listbox.xml                               | 10 ++-----
 ...ess_viewSimulationMovementSnapshotList.xml |  5 +---
 .../listbox.xml                               |  5 +---
 .../SolverProcess_viewSolverDecisionList.xml  |  5 +---
 .../listbox.xml                               |  5 +---
 .../SolverTool_viewSolverProcessList.xml      |  5 +---
 .../listbox.xml                               | 10 ++-----
 .../Solver_viewConfiguration.xml              |  5 +---
 .../my_configuration.xml                      | 10 ++-----
 .../Solver_viewConfigurationFormBox.xml       |  5 +---
 ...ringDivergenceTester_viewConfiguration.xml |  5 +---
 .../my_tested_property.xml                    |  5 +---
 .../my_tested_property_title.xml              |  5 +---
 .../erp5_simulation/TargetSolver_view.xml     |  5 +---
 .../my_delivery_title_list.xml                | 10 ++-----
 .../TargetSolver_view/my_portal_type.xml      |  5 +---
 .../erp5_simulation/TesterType_view.xml       |  5 +---
 .../TesterType_view/my_tested_property.xml    |  5 +---
 .../erp5_simulation/Tester_view.xml           |  5 +---
 .../Tester_view/my_description.xml            |  5 +---
 .../Tester_view/my_divergence_provider.xml    |  5 +---
 .../Tester_view/my_matching_provider.xml      |  5 +---
 .../Tester_view/my_portal_type.xml            |  5 +---
 .../Tester_view/my_solver_list.xml            | 10 ++-----
 .../erp5_simulation/Tester_view/my_title.xml  |  5 +---
 .../Tester_view/my_updating_provider.xml      |  5 +---
 ...olver_getConfigurationPropertyListDict.xml |  5 +---
 ...er_getDefaultConfigurationPropertyDict.xml |  5 +---
 .../UnifySolver_viewConfigurationFormBox.xml  |  5 +---
 .../my_tested_property_list.xml               | 20 +++----------
 .../my_value.xml                              | 20 +++----------
 bt5/erp5_simulation/bt/revision               |  2 +-
 2596 files changed, 3381 insertions(+), 12709 deletions(-)

diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/change_function.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_base/ActionTemplateItem/portal_types/Address/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
index d1bae85549..9ec6d51597 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/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_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
index 37263e59ad..5fa7093438 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/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_base/ActionTemplateItem/portal_types/Agent/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
index 840d5a58f7..cf52295d06 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.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_base/ActionTemplateItem/portal_types/Agent/import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
index 840a2d14df..1b868c6396 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.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_base/ActionTemplateItem/portal_types/Agent/signature.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
index e71fd68619..13a00bade5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.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_base/ActionTemplateItem/portal_types/Agent/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
index ebf4db5584..f1a504fb1f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/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_base/ActionTemplateItem/portal_types/Assignment/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
index 4795b8b428..368a7afc71 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/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_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
index 160c4f3566..3b86f471bd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/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_base/ActionTemplateItem/portal_types/Base%20Variant%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Base%20Variant%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Base%20Variant%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Base%20Variant%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Career/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/change_function.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_base/ActionTemplateItem/portal_types/Career/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
index 76433d0a5e..6952eba8e5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/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_base/ActionTemplateItem/portal_types/Category%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Category%20Movement%20Group/view.xml
index 197525691e..fecdf1217a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Category%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Category%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Causality%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Causality%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml
index be5386769e..438b6ca07a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Chat%20Address/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_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
index 88fcb86a9a..b7f52b239b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/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_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
index 6636736e5a..c00b069362 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%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_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
index 11cedbfc45..226622b78a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%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_base/ActionTemplateItem/portal_types/Currency/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
index 6bdc048cc9..35ead8e4fc 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/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_base/ActionTemplateItem/portal_types/Day%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Day%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Day%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Day%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
index 67a81e0599..c9a8023ca7 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/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_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
index de6a640814..bc65ed55ca 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.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_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
index 774fae7061..b9e5c81425 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.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_base/ActionTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Email/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/change_function.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_base/ActionTemplateItem/portal_types/Email/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
index c4c9304735..8dbc065e91 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/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_base/ActionTemplateItem/portal_types/Fax/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/change_function.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_base/ActionTemplateItem/portal_types/Fax/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
index 1bc1380661..ed886acaff 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/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_base/ActionTemplateItem/portal_types/File/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
index a3298b1e11..982662d099 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.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_base/ActionTemplateItem/portal_types/File/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
index eaefe2649d..0d6ab44bcc 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/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_base/ActionTemplateItem/portal_types/Image/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/change_function.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_base/ActionTemplateItem/portal_types/Image/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
index d87ac6ffd4..b000238c98 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.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_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
index 1d4ff5021d..03ab526322 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_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_base/ActionTemplateItem/portal_types/Image/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
index ca04691e22..153c854c45 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/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_base/ActionTemplateItem/portal_types/Invoice%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Invoice%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Invoice%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Invoice%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Link/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
index be5386769e..438b6ca07a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/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_base/ActionTemplateItem/portal_types/Mapped%20Property/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Mapped%20Property/view.xml
index 6b7bbc73f2..e446858416 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Mapped%20Property/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Mapped%20Property/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_base/ActionTemplateItem/portal_types/Mirror%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Mirror%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Mirror%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Mirror%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Monthly%20Range%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Monthly%20Range%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Monthly%20Range%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Monthly%20Range%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Nested%20Line%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Nested%20Line%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Nested%20Line%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Nested%20Line%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml
index 4b5f535984..b363815e24 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message%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_base/ActionTemplateItem/portal_types/Notification%20Message/list.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/list.xml
index 973fde712c..73d3d387a3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/list.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/list.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_base/ActionTemplateItem/portal_types/Notification%20Message/local_permission.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/local_permission.xml
index 39073f7c9d..88b42ad485 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/local_permission.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/local_permission.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_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml
index 872b8b3573..55426eb6b2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/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_base/ActionTemplateItem/portal_types/Notification%20Message/view_editor.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view_editor.xml
index c5a42cc6f6..88ab457df5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view_editor.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Notification%20Message/view_editor.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_base/ActionTemplateItem/portal_types/Order%20Builder/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view.xml
index 393c199bb5..e544f01fe4 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/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_base/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
index de6a640814..bc65ed55ca 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.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_base/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
index cc83a2c161..b1df55eef9 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Builder/view_profile.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_base/ActionTemplateItem/portal_types/Order%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Order%20Tool/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Tool/view.xml
index d091cb6f19..c022b73dd6 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Tool/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Order%20Tool/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_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
index 376fe83c68..3c3e525eaa 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%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_base/ActionTemplateItem/portal_types/Organisation/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
index d06d0b48a0..faf8052889 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.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_base/ActionTemplateItem/portal_types/Organisation/document_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml
index 3ae0300ad1..a3935347ca 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_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>
@@ -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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
index 7b6c6226fa..7c9ad21a4d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_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_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
index 0eed26f477..376c1c7cbf 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/jump_to_persons.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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
index fa2555e52a..65bae3a8e5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/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_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group/view.xml
index 197525691e..fecdf1217a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group/view.xml
index 197525691e..fecdf1217a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Person%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
index d8893018d7..3ab8977e9f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person%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_base/ActionTemplateItem/portal_types/Person/assignment.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
index caa19e7cd3..ea4f48d5c6 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.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_base/ActionTemplateItem/portal_types/Person/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
index abb3a22e00..2c54c7a86b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.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_base/ActionTemplateItem/portal_types/Person/document_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml
index 8b79c06974..7fa01b73f3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_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>
@@ -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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
index b41dd8e027..6df7521154 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_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_base/ActionTemplateItem/portal_types/Person/person_detailed_report.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/person_detailed_report.xml
index 1480b35037..686c0c216c 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/person_detailed_report.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/person_detailed_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>
@@ -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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml
index 1f7374557e..db2dca03c8 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.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_base/ActionTemplateItem/portal_types/Person/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
index 522e2dd0d7..2a71d2718e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/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_base/ActionTemplateItem/portal_types/Preference/base_preference.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Preference/base_preference.xml
index ae5dd4d792..7a5dcf113d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Preference/base_preference.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Preference/base_preference.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_base/ActionTemplateItem/portal_types/Property%20Assignment%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Assignment%20Movement%20Group/view.xml
index 6d8e1ab53b..1892636713 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Assignment%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Assignment%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Property%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Movement%20Group/view.xml
index 197525691e..fecdf1217a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Query%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml
index ee5a6592fe..524353a851 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Query%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Query%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_base/ActionTemplateItem/portal_types/Query/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Query/view.xml
index 216bab3515..2b55ebcc57 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Query/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Query/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_base/ActionTemplateItem/portal_types/Requirement%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Requirement%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Requirement%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Requirement%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml
index 26cba93613..290adb99e3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Role%20Definition/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_base/ActionTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Rounding%20Model/predicate_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Model/predicate_view.xml
index 78c5665612..b1343b5438 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Model/predicate_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Model/predicate_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>
@@ -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_base/ActionTemplateItem/portal_types/Rounding%20Model/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Model/view.xml
index e095791212..9a5591d9e0 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Model/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%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>
@@ -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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Tool/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Tool/view.xml
index 9dc61f7b8c..a9952b6793 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Tool/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Rounding%20Tool/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>
@@ -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>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Telephone/change_function.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml
index ec45415f26..01e6d487b3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/change_function.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_base/ActionTemplateItem/portal_types/Telephone/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
index 1bc1380661..ed886acaff 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/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_base/ActionTemplateItem/portal_types/Title%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Title%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Title%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Title%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Variant%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Variant%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Variant%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Variant%20Movement%20Group/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_base/ActionTemplateItem/portal_types/Variation%20Property%20Movement%20Group/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Variation%20Property%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Variation%20Property%20Movement%20Group/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Variation%20Property%20Movement%20Group/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_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml
index e32ac7549a..f32fc4e7c0 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/jump_query.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>
@@ -62,10 +59,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>
@@ -82,10 +76,7 @@ string:${object_url}/Base_jumpToRelatedObject?portal_type=Query&base_category=ag
   </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_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml
index 7089e22c7d..65b0ce5c78 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/portal_actions/post_query.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>
@@ -62,10 +59,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>
@@ -78,10 +72,7 @@
   </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_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
index 025def6344..8469204f86 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
index c322c788f0..d8e80068d2 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
index 0fe7f381fb..eeafbb75ea 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
index 74db7e159f..d57a6d9fd7 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
index e7f876dfb2..6dada6c117 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
index ab731c2b89..bca5dc905d 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
index 166988f23c..c59ab2d422 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
index bbd0452609..d784a962dc 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/bank_account_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/bank_account_type.xml
index 47f95b24a6..0804d8a919 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/bank_account_type.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/bank_account_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_base/CategoryTemplateItem/portal_categories/collect_order_group.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/collect_order_group.xml
index 0232d24640..73e7815d92 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/collect_order_group.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/collect_order_group.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.xml
index 09f2187ed1..dc2dfa0661 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/conflicting_solver.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_base/CategoryTemplateItem/portal_categories/contributor.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/contributor.xml
index 3b23ec7ad4..1038f9fc8d 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/contributor.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/contributor.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>
@@ -229,7 +226,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -237,7 +234,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
index 22d4edca65..6c81f127b1 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml
index 746535af56..b548125926 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.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>
@@ -187,7 +184,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -195,7 +192,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_solver.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_solver.xml
index cefdf78ab9..7632db2546 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_solver.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_solver.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_base/CategoryTemplateItem/portal_categories/destination_carrier.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml
index cab092013d..d754035f31 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.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_base/CategoryTemplateItem/portal_categories/destination_referral.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml
index 856a5c6270..9749ab6f98 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.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_base/CategoryTemplateItem/portal_categories/destination_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml
index e7d8fcc70e..88edf7b889 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.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>
@@ -191,7 +188,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -199,7 +196,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/divergence_scope.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/divergence_scope.xml
index ab3b0790ed..d70a6df437 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/divergence_scope.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/divergence_scope.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>
@@ -68,7 +65,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -76,7 +73,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
index 18c88332ae..e4f486ffda 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.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>
@@ -183,7 +180,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -191,7 +188,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/end_of.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/end_of.xml
index 0faf068c49..3d2368585b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/end_of.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/end_of.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>
@@ -183,7 +180,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -191,7 +188,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml
index e5660098d6..40cdb42baf 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
index af2f94c1e1..6fe42d9035 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.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>
@@ -189,7 +186,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -197,7 +194,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
index 4563939613..d77efcfae1 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
index 5fee4588c1..638a956eaf 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
index 28e9d3ff86..2c2d566d18 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
index f22b6b4f8f..c6f4120383 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.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>
@@ -183,7 +180,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -191,7 +188,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
index 180e265f7f..6b7fa92e1a 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
index cafe5e5871..9e6983e073 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
index 988465d6ea..4a8330f9e6 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
index 64c6fe31fe..2acfe20b09 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
index 4b4960fdf3..ee225c6e74 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml
index 2e4246bb9a..9fae29b415 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.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>
@@ -188,7 +185,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -196,7 +193,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/payment_mode.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/payment_mode.xml
index 17d5ee6b9d..61b404a27c 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/payment_mode.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/payment_mode.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>
@@ -211,7 +208,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -219,7 +216,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml
index 837b7a663f..ce0dad658b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
index 7837495881..c76b429313 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml
index 79f825ba2c..6af10d2008 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.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_base/CategoryTemplateItem/portal_categories/region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
index 226e036fe9..1873f76394 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/resource_use.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/resource_use.xml
index 4e182c90a3..61ae7d20a4 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/resource_use.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/resource_use.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_base/CategoryTemplateItem/portal_categories/role.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
index eb5c30e003..cb76d2a5b9 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
index b018c4b30a..54dc764b62 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
index cd46a47dfa..55725ba7d8 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
index 28b94ffd65..6360ef0ec4 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
index 0ad97f2867..9e1b1076f9 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.xml
index 791d3d7087..7fc40a64a2 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/solver.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_base/CategoryTemplateItem/portal_categories/source_carrier.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml
index 5ded3412bb..0b6097ee8f 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.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_base/CategoryTemplateItem/portal_categories/source_referral.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml
index de3d5e792b..6612fe975a 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.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_base/CategoryTemplateItem/portal_categories/source_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml
index c45abdf6de..2637e50ce6 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.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>
@@ -191,7 +188,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -199,7 +196,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
index 25c5f57301..00ff92d7ac 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml
index a0db5811db..0386e8ae96 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml
index 6b194e23e9..b8dd1939e3 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.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>
@@ -190,7 +187,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -198,7 +195,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/update_frequency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/update_frequency.xml
index f7147e7508..2d258c703e 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/update_frequency.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/update_frequency.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>
@@ -126,7 +123,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -134,7 +131,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
index 18e31fbb95..166b1f3e41 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.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>
@@ -77,7 +74,7 @@ discount, any other special utilisation.</string> </value>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -85,7 +82,7 @@ discount, any other special utilisation.</string> </value>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
index 38027c8ba8..16a5afc645 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="CacheFactory" module="Products.ERP5Type.Document.CacheFactory"/>
-        <tuple/>
-      </tuple>
+      <global name="CacheFactory" module="Products.ERP5Type.Document.CacheFactory"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -58,7 +55,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -66,7 +63,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory/volatile_cache_plugin.xml b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory/volatile_cache_plugin.xml
index ff666e7a39..555548de8b 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory/volatile_cache_plugin.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_caches/document_cache_factory/volatile_cache_plugin.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RamCache" module="Products.ERP5Type.Document.RamCache"/>
-        <tuple/>
-      </tuple>
+      <global name="RamCache" module="Products.ERP5Type.Document.RamCache"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/cell.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/cell.xml
index 0063a4d70a..eeca3bb644 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/cell.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/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_base/PathTemplateItem/portal_categories/collect_order_group/delivery.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/delivery.xml
index d5c2ddb9c3..2b14a36a95 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/delivery.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/delivery.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_base/PathTemplateItem/portal_categories/collect_order_group/line.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/line.xml
index 41195a1322..b0ba4546b4 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/line.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/collect_order_group/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_base/PathTemplateItem/portal_categories/divergence_scope/category.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/category.xml
index a6521d4d5e..be1be99f2f 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/category.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/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_base/PathTemplateItem/portal_categories/divergence_scope/property.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/property.xml
index 62ae59ad86..afed9e3535 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/property.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/property.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_base/PathTemplateItem/portal_categories/divergence_scope/quantity.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/quantity.xml
index 180775e857..4079c57b39 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/quantity.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/divergence_scope/quantity.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_base/PathTemplateItem/portal_memcached/persistent_memcached_plugin.xml b/bt5/erp5_base/PathTemplateItem/portal_memcached/persistent_memcached_plugin.xml
index d710c2f05d..4c1ab85156 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_memcached/persistent_memcached_plugin.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_memcached/persistent_memcached_plugin.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MemcachedPlugin" module="Products.ERP5Type.Document.MemcachedPlugin"/>
-        <tuple/>
-      </tuple>
+      <global name="MemcachedPlugin" module="Products.ERP5Type.Document.MemcachedPlugin"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
index d384463850..6618803015 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
index c87e7c8b7e..8158d5279a 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
index 0889357a27..cd690d53dc 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
index eecce85f0f..4aacab8bdb 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Assignment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
index de2641e2a7..d3f0da1b77 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Base%20Variant%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Base%20Variant%20Movement%20Group.xml
index a26a04ba37..947e1ddd8f 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Base%20Variant%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Base%20Variant%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>BaseVariantMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
index a5a8cd3f1d..8690b8e25b 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Career.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Movement%20Group.xml
index bda41c1fa8..fee0139512 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Category%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CategoryMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group.xml
index b666e3c235..5fa62c7ba4 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Assignment%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CausalityAssignmentMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Movement%20Group.xml
index 4e1e91c892..7c44ffb803 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Causality%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CausalityMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
index 80d9d0a372..48cf39328d 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Chat%20Address.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
index cdadd6e7eb..cec88bc4d7 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
index 8ba8143483..52977156f8 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
index 02fcade175..86966d1720 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
index 6274828333..1dd138e307 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
index 733f0dfb58..70b75c4d96 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Day%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Day%20Movement%20Group.xml
index 7e19c7ac3e..53c297e2b9 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Day%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Day%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
index c0c3d9b638..8439bd1dab 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -110,15 +107,16 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>SimulatedDeliveryBuilder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -135,10 +133,7 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group.xml
index 18cfe90423..70befd45c5 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Causality%20Assignment%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@ simulation movements instead of order relation. This is intended to be used in d
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>DeliveryCausalityAssignmentMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
index b910783aa9..3c8dc49729 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -65,10 +62,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +79,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
index 1915d63670..e0a115feb9 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Email.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
index 957f631270..add6debbbc 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Fax.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
index 47256d075e..f9e22a1364 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/File.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -111,10 +108,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -131,10 +125,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
index 3c5b62e4c3..d785a18a91 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Invoice%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Invoice%20Movement%20Group.xml
index 10d8cd29dd..4fd237894a 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Invoice%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Invoice%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
index d7ceac1cca..f4335d4213 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
index cfee267e89..893cbb005c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -51,6 +48,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>MappedProperty</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mirror%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mirror%20Movement%20Group.xml
index 09abd19e9d..eb4ba2f10c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mirror%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mirror%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>MirrorMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Monthly%20Range%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Monthly%20Range%20Movement%20Group.xml
index 4bfe3dab67..730c52ed2c 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Monthly%20Range%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Monthly%20Range%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Nested%20Line%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Nested%20Line%20Movement%20Group.xml
index eb0ae9a3c1..bb25dc0bf2 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Nested%20Line%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Nested%20Line%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
index 5e2f5f3c90..60ca1130e1 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -84,15 +81,16 @@
             <key> <string>id</string> </key>
             <value> <string>Notification Message Module</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -109,10 +107,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message.xml
index 98105e20b7..13dd6b4f56 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Notification%20Message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
index 951c3d5c03..61d6352cc2 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Movement%20Group.xml
index 0f8fd4caae..149d82b10e 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>OrderMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Tool.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
index 92e8c82b5c..e01caee679 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -65,10 +62,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +79,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
index d9df1b7f6e..e91799d1c2 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml
index a96768a68f..23f40b6312 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml
index 85e7ca5274..63dcf60d75 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group.xml
index 9bc53192b8..4553f3a72a 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Explanation%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
index 3aa2b73591..6b0168ec08 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
index 4647f809cf..6df81400b1 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,10 +96,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -119,10 +113,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -139,10 +130,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -159,10 +147,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -179,10 +164,7 @@
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Assignment%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Assignment%20Movement%20Group.xml
index 710a6db5a9..527bd5b96b 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Assignment%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Assignment%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Movement%20Group.xml
index 6936d7d4eb..186e9454a6 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>PropertyMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group.xml
index 3bc7bec940..b92885fd6f 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Quantity%20Sign%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query%20Module.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query%20Module.xml
index 685e1fafc7..a46e1754f9 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query%20Module.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -84,6 +81,10 @@
             <key> <string>id</string> </key>
             <value> <string>Query Module</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query.xml
index fffce35b69..48c3d993a1 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Query.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -79,10 +76,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,10 +93,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Requirement%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Requirement%20Movement%20Group.xml
index 18124ff24e..3635053f9b 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Requirement%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Requirement%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>RequirementMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Role%20Definition.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Role%20Definition.xml
index e52e513183..1b4be86ec3 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Role%20Definition.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Role%20Definition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -79,10 +76,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -99,10 +93,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group.xml
index fb5bbd87df..8bf4e4f57d 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Model.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Model.xml
index a7149b5b26..02f6a183a5 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Model.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Model.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Tool.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Tool.xml
index 7cd5342936..d997fba33f 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Tool.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Rounding%20Tool.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -73,10 +70,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -93,10 +87,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Movement%20Group.xml
index a758dbbcae..3166fc380b 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>SplitMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group.xml
index 532e10c581..51e2f8c1ef 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Tax%20Line%20Delivery%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
index bd20819bff..483c9f4452 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Telephone.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Title%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Title%20Movement%20Group.xml
index 12191bb5b5..0f15a0e8af 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Title%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Title%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>TitleMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variant%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variant%20Movement%20Group.xml
index 4e707cb5cd..d8c93c8f80 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variant%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variant%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,6 +56,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>VariantMovementGroup</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variation%20Property%20Movement%20Group.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variation%20Property%20Movement%20Group.xml
index 97b1622de8..3e5e1ecb14 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variation%20Property%20Movement%20Group.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Variation%20Property%20Movement%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base.xml
index a1620c18ff..5bdb186e10 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base.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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
index 08d347dcec..baffb80946 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
index 9358319213..2485159a62 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
index dd545d0ab8..42021da1c4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
index b2f20ab5a6..3d0f3b1f44 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
index de337bad72..1b215a69f3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml
index 52ae75b8a0..afa0be1779 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_agent_privilege.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_agent_privilege.xml
index ed6865d393..1f2acc6e55 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_agent_privilege.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_agent_privilege.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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_description.xml
index e1a13d0620..82f05b864c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_id.xml
index b76d9cea55..ae19e3dc8c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_operation_upper_limit.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_operation_upper_limit.xml
index 6671913f5b..111b29e255 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_operation_upper_limit.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_operation_upper_limit.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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_start_date.xml
index 0e0474d9ea..de918a41f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_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_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_stop_date.xml
index 76427e2356..fa4e92fe5b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml
index 51c34e67bd..fdb2f6aaa9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/Image_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/Image_view.xml
index 0e3e83d7bd..16cbc7e34a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/Image_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/Image_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ImageField" module="Products.ERP5Form.ImageField"/>
-        <tuple/>
-      </tuple>
+      <global name="ImageField" module="Products.ERP5Form.ImageField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox.xml
index 9f616b44ea..dc95c0373d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -553,10 +550,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_agent_privilege.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_agent_privilege.xml
index 251b5c9acb..de96743f1a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_agent_privilege.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_agent_privilege.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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_operation_upper_limit.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_operation_upper_limit.xml
index 6c46977a85..c41915f036 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_operation_upper_limit.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_operation_upper_limit.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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_start_date.xml
index fa42a027b8..f45947f7bb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_stop_date.xml
index dcf1d2cade..5d26b7c7cf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_agent_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_agent_title.xml
index 1af691ccde..b0029b83ab 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_agent_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_description.xml
index e1a13d0620..82f05b864c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_int_index.xml
index 9b9665f23d..6f0a14cf00 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_start_date.xml
index 0e0474d9ea..de918a41f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
index 7f6ed75e3a..d5be3cd7fc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature/image_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature/image_view.xml
index d63468e85f..4e0f812647 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature/image_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature/image_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ImageField" module="Products.ERP5Form.ImageField"/>
-        <tuple/>
-      </tuple>
+      <global name="ImageField" module="Products.ERP5Form.ImageField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
index 280e63e1ea..257f98ce4f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog/your_import_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog/your_import_file.xml
index 5012b73f9d..804f641945 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog/your_import_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog/your_import_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FileField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FileField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
index 4ffa857fb8..2370630b8b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_activity.xml
index af057426cf..06a3719412 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_calendar_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_calendar_title_list.xml
index 10fe62b977..a4f2d7f92f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_calendar_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_calendar_title_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_project_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_project_title.xml
index 79ef5a540d..ff649f135b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_project_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_project_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_title.xml
index 117a9ef8fb..dc957405bf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_destination_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_function.xml
index 5beb5af4a0..0956068f58 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_function.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_group.xml
index fecc0eb9ff..2527b2728e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_group.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_site.xml
index 8f641e9009..e4f12ac852 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_site.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml
index 03d2f1609c..fc8cf218f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml
index 47228b3dc3..d6095d4aa3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_title.xml
index 55efe27043..8fe7359979 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
index 785e17fd9c..772049a651 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
index 0e49244c7a..b420fda02a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_calendar_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_calendar_title_list.xml
index 54aa853762..92f0756b7a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_calendar_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_calendar_title_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>
@@ -189,10 +186,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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
index 3ac84dc37c..3feb994380 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
index c7193c93df..ed3b8640d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
index 3a9b1a7a17..9e58db0f96 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
index 3b4a563bee..44d1677ab4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
index 6918f959a0..b9300df7cd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
index 69f526cc75..128a7730fb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
index bbe575ea51..62633a1da5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
index 29bac7a934..1ca6beb34f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
index 9612b254a2..c702267d28 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
index 5ad7069b00..855ad9dfa6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/listbox.xml
index 5d89da8609..dee2ae2212 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_holder_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_holder_name.xml
index 609b7ab2d5..ee4314482b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_holder_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_holder_name.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_key.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_key.xml
index 0419f20921..605c9834a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_key.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_number.xml
index e6a5d66ceb..e08e8c43c0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_number.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_type.xml
index d5a9cd0aec..418cc8844f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_account_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_code.xml
index 78962352be..4c28c47a35 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_code.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_country_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_country_code.xml
index 57c10a9147..9f19d1693e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_country_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bank_country_code.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_branch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_branch.xml
index d175fc0d01..4008f84f5c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_branch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_branch.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_comment.xml
index 690db1ad99..2599591b62 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_overdraft_facility.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_overdraft_facility.xml
index b31c6a7914..1bafa5d387 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_overdraft_facility.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_overdraft_facility.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_price_currency.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_price_currency.xml
index f0e0501c45..2fcd9bbf78 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_price_currency.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_price_currency.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_source_title.xml
index 6eb31db0bc..519a880866 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_source_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_start_date.xml
index 0f669af57d..4baf7871aa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_stop_date.xml
index f5bc9227c7..0d0a6671b4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_title.xml
index d7ba8c6c7b..485a2d1bd6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
index 912d4476e5..6413af130a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
index 807d33a8df..ffa12d3f0f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
index 3a063a4ff4..b3bd87a761 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
index 2ed2d408b1..609a9dbf35 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
index d76d0bdff2..0102cdd487 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_type.xml
index f2fabf7738..e418b6e072 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
index 8055afab23..2e91664bad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
index a63b9dedb3..04f7837959 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
index e847ae7891..96fc710b2c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_comment.xml
index 06555dcada..9a170e82c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_overdraft_facility.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_overdraft_facility.xml
index fb8ff83e29..75def3a487 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_overdraft_facility.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_overdraft_facility.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
index 22cf6384d3..8b56d28349 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
index a0f12dbf33..383255ac91 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
index a89e39080f..3f0f38aa37 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
index a8dce7bc1f..8800d08ee5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
index 035873c530..a194ddb0c9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml
index f54cd0738f..eaed3a9c83 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_convertCurrencyCodeToNumericCode.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getDiffBetweenDateAndNow.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getDiffBetweenDateAndNow.xml
index 0d32ab0848..9840416464 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getDiffBetweenDateAndNow.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getDiffBetweenDateAndNow.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getIconAsHTML.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getIconAsHTML.xml
index 53e9d8def7..c4b241dc9a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getIconAsHTML.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getIconAsHTML.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml
index 5fa2df729d..365db0056b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOrganisationForSectionCategory.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOwnerTitle.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOwnerTitle.xml
index 96df0b328d..fdd0f2f82a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOwnerTitle.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getOwnerTitle.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml
index b8c2318451..7e3a3b9e22 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getPreferredCategoryChildItemList.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml
index 348fe1ca70..bb24e7b9de 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSectionUidListForSectionCategory.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndex.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndex.xml
index 229d19b220..4d32ef4eed 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndex.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndex.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml
index 3c7f67cb37..829adc56d9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_initIntIndexAndReference.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
index d723f97919..6b447d68c1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml
index 388e9d2624..50db161579 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_postQuery.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml
index 7c4e8674c1..107f9354ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog/your_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog/your_id.xml
index fe172d8d71..a695ef5dbc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog/your_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog/your_id.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList.xml
index 9f700fd550..5190a3e33d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox.xml
index ecf2270f02..d96b6696fd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox_role_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox_role_name.xml
index ed7af27111..5f707029d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox_role_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/listbox_role_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/my_title.xml
index 318d6ff5dd..3c76733945 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewLocalPermissionList/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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml
index 9d542eb6f1..af98aefe43 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog/your_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog/your_description.xml
index b6581890f7..b47bc00b60 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog/your_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog/your_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml
index aeab869e2d..d4958faac4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunction.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml
index 03393aa8b7..d112023027 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml
index db98591300..fa0968beaf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_activity.xml
index 8e240d650d..fd5f0a90a3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_collective_agreement_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_collective_agreement_title.xml
index 4ae008ac5a..3036b97dc9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_collective_agreement_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_collective_agreement_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_function.xml
index 510c6a8437..9b8b2ccd8f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_function.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_grade.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_grade.xml
index d48d2544f5..58d0915999 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_grade.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_product_line_list.xml
index e23e18350d..dd00681339 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_product_line_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_reference.xml
index ff5d92ebba..eee660ba69 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_role_list.xml
index 63b8238b7b..a60a79d0bb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_role_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml
index 2277c94493..adc324b979 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_coefficient.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_level.xml
index b72ce29624..01c36a5bef 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_salary_level.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_skill_list.xml
index f885083891..9aba2c1677 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_skill_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml
index 4b5d8a6eb7..08aa0325ba 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml
index 7286760f31..6acbfb7776 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_subordination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_subordination_title.xml
index 0fcbd3f2b5..e1bb7b84f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_subordination_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_title.xml
index 0a08dc777c..542da5260c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
index 79adf87c8d..9da4af8516 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
index e4bc656603..a60b78c91b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
index 63bd236600..bc98313771 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
index 85e607ff57..7a8f283cfe 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.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>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
index ed753032c3..e42f9b3bd8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_reference.xml
index 477b002ec0..b88d3b5677 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role_list.xml
index 27dadad3d3..57fec2c551 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role_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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_coefficient.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_coefficient.xml
index a79e059e89..cb05cbafe9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_coefficient.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_coefficient.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
index 6e586118a5..540938a388 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
index 3ceec97246..5b95cd1e2c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
index fc4aae341c..25c1021bd3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
index 8506896cca..464f415793 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
index c044060c5a..62d0f76f9b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
index 29bac7a934..1ca6beb34f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
index 81dfbd6e16..3f2937f20a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
index 281691e3a4..5647158d8f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
index 0f9ceb4112..98acb63b67 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
index df0d7d538b..b81bcd5ae0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml
index 5652a48bef..3fd364ff58 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_holder_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_holder_name.xml
index eeabd54080..20db502044 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_holder_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_holder_name.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
index 11efca0de6..8337bb65eb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_number.xml
index b3ace31441..a40b5da7ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_number.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
index 7a71dfaf5a..f5723ba5cc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_price_currency.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_price_currency.xml
index 2a616d9564..fcce132423 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_price_currency.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_price_currency.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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_source_title.xml
index dd377c971c..1b7f92754e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_source_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_start_date.xml
index 64d4317e69..b630acaef8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_stop_date.xml
index b2055e2c11..ac862511ac 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_title.xml
index d7ba8c6c7b..485a2d1bd6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
index 555d3433ae..23f6dc9d76 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
index 587013a8f8..39e380afbd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
index 0ee8426c22..45979bb3ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
index 93abe06439..7b0595f5d0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox_base_unit_quantity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox_base_unit_quantity.xml
index 8024f4e01b..410e1fed20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox_base_unit_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox_base_unit_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml
index 2d23ee05d1..fb3d995eda 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_asNumericCode.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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
index d8495758f3..fb1183c4e3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
index b3e5810dbc..7f1237ef6e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml
index 6b8d4044c2..e1e254a945 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml
index 4bb7ef3762..afe96fcf5f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_base_unit_quantity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_base_unit_quantity.xml
index fd517962aa..9acf516207 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_base_unit_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_base_unit_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_reference.xml
index d320218209..3e8f397f19 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_short_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_short_title.xml
index 753a001f2a..8ba6493b90 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_short_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_short_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_title.xml
index d213d7fa6f..fa30f2f12d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
index 5d6303c4df..d03f8c14ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
index ddd08e8584..c9b30aa369 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_currency_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_currency_list.xml
index 93f96511ac..d6a191940f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_currency_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_currency_list.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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
index 41708757e0..112167f23d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
index caca061971..5b54ad2714 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
index f5f5020e46..3319d66619 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
index da80ca099f..6a1b14cfc9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
index 581f84a38c..03d3d1b830 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList.xml
index a154f8a55b..b5b30310a5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList.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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/listbox.xml
index 8ca5426510..ef9f30cf47 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_id.xml
index fd3771d947..0e828c6c0a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_resource_portal_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_resource_portal_type.xml
index d7f31c9f43..03c22fe7a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_resource_portal_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_resource_portal_type.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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewPredicateGroupList/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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile.xml
index fb2e375d8b..0d911375a3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile.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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_administration_organisation_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_administration_organisation_title.xml
index ec1a098297..e4855bb69e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_administration_organisation_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_administration_organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_decision_organisation_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_decision_organisation_title.xml
index 5b42a8f4ce..a348a35e91 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_decision_organisation_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_decision_organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_payment_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_payment_title.xml
index f1bb6fe6b5..c06bfc658a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_payment_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_payment_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_section_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_section_title.xml
index 74b8e3eab2..a99ff2ae6b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_section_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_title.xml
index e62b4224ed..cea5ecd36c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_destination_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_administration_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_administration_title.xml
index 182ab7513c..1757ea9504 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_administration_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_decision_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_decision_title.xml
index d20e09995a..2b3aff2a63 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_decision_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_payment_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_payment_title.xml
index 2877667784..978b605b4e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_payment_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_payment_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_section_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_section_title.xml
index 74b5dc18f5..354ec42f3b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_section_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_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_title.xml
index 19666ec72c..c43d46da98 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_viewProfile/my_source_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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_acceptDecision.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_acceptDecision.xml
index 22a7e9b1ef..2902fca3a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_acceptDecision.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_acceptDecision.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_calculate.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_calculate.xml
index f233924336..91b1d4632a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_calculate.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_calculate.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getCellGroupDivergenceList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getCellGroupDivergenceList.xml
index 98c90e9023..6f343f7d5f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getCellGroupDivergenceList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getCellGroupDivergenceList.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getDeliveryGroupDivergenceList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getDeliveryGroupDivergenceList.xml
index ae32428a93..286077c960 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getDeliveryGroupDivergenceList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getDeliveryGroupDivergenceList.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml
index 813a7bc1f9..b17b55c40e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
index 95479a28fd..224fc40210 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_isSplitAndDeferPossible.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_isSplitAndDeferPossible.xml
index 047a176b0d..6c78a90645 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_isSplitAndDeferPossible.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_isSplitAndDeferPossible.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
index cc6a06d7ff..80d509e6a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateAppliedRule.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateAppliedRule.xml
index 31de0fcd95..c83c3aae9d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateAppliedRule.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateAppliedRule.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
index ce7450cd47..3bd48655fe 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog.xml
index 32340d75ca..04f83500f9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox.xml
index 7f3937c88d..3079a6c7aa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -541,10 +538,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox_choice.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox_choice.xml
index 45eae85727..abbaaf4a1f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox_choice.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/cell_group_listbox_choice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -254,10 +251,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox.xml
index b59fadb816..fc221ae458 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -529,10 +526,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox_choice.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox_choice.xml
index b683dcadab..8c94ac84df 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox_choice.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/delivery_group_listbox_choice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -254,10 +251,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
index 89d260e111..6b1dd7ebd3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -547,10 +544,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox_choice.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox_choice.xml
index 59fc203062..d5d13cbd35 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox_choice.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox_choice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -254,10 +251,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_comment.xml
index 35213a9cf0..c79812dbc3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml
index 570df2e68d..458ab040ce 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/your_workflow_action.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog.xml
index 4e75c247a9..06e876ed76 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox.xml
index 711fb0efb4..462610478f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -553,10 +550,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_choice.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_choice.xml
index 145af3bf9e..a50c8143ec 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_choice.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_choice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RadioField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="RadioField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -254,10 +251,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_prevision_quantity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_prevision_quantity.xml
index ffc50e1070..79709d2cd5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_prevision_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_prevision_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>
@@ -114,10 +111,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_quantity_unit.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_quantity_unit.xml
index e470a722a5..bb9fb91ea8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_quantity_unit.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/listbox_quantity_unit.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>
@@ -139,10 +136,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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_comment.xml
index bd0c01e200..c7bc053d3d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_start_date.xml
index d9e95b3d50..0799a9b347 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_stop_date.xml
index f635884312..ae2e7c8180 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_workflow_action.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_workflow_action.xml
index e2df2e5d76..5ea57175b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_workflow_action.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSplitAndDeferDialog/my_workflow_action.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_base/SkinTemplateItem/portal_skins/erp5_base/Document_checkConversionFormatPermission.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_checkConversionFormatPermission.xml
index 25b34803cc..822546a8f8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_checkConversionFormatPermission.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_checkConversionFormatPermission.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_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
index 16b756542d..25a6c14e8d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Folder_getUnrestrictedContentTypeList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Folder_getUnrestrictedContentTypeList.xml
index 211fb302f3..56e0aa9925 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Folder_getUnrestrictedContentTypeList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Folder_getUnrestrictedContentTypeList.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
index 496b0f856b..67c0a414fa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
index 122cbccebc..c352591156 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
index 17bae73153..e2ddd7ccc4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_int_index.xml
index 7eb0a072ac..d90e1f0a48 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_title.xml
index 284d550251..e5af0ba6d4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_translated_id.xml
index c7a07dab38..d8cbc86f2f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_translated_id.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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_url_string.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_url_string.xml
index a3609e0c1d..7f729885d3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_url_string.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view/my_url_string.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
index 4c35944194..a51a00f162 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
index 7da3b7c822..9da3fc3f69 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
index c2ca89af9c..d86226c918 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
index 580126a6c2..a8e8687d7f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
index 78c83a024f..7b37cb7e64 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml
index 1e75a9481f..38ba6f9536 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
index ebc398982c..ccef63302c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
index 5d149d8610..04da4b736e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
index 29bac7a934..1ca6beb34f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_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_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
index 91c237e8c5..c22d37b850 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.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_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewHtmlMimeMessage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewHtmlMimeMessage.xml
index 6292f8ad5c..283ac05303 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewHtmlMimeMessage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewHtmlMimeMessage.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewMimeMessage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewMimeMessage.xml
index e4a368d4f0..e553e919d8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewMimeMessage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_viewMimeMessage.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml
index 8f47453bb8..a146ac6c3c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_description.xml
index 168eb1fff6..52eaaafe6a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_file.xml
index 7265a5018a..8ecefdb96f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_file.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_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_source_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_source_reference.xml
index f39bc5b6eb..3811a275e3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_source_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_source_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_title.xml
index d31b9ace77..36facfb28d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary.xml
index b3d1606691..b88e565f11 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_file.xml
index 26879b9a4c..f8d85d9ef2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_file.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FileField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="FileField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_source_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_source_reference.xml
index 8894aad57a..e2fb19f2dd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_source_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_source_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_thumbnail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_thumbnail.xml
index ee9e29207e..e97f73a869 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_thumbnail.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_thumbnail.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_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_title.xml
index 22ca121ae7..53cb3350c1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
index cb806f5237..63a64041da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_city.xml
index 92cb72e99b..dd4418311a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_city.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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_int_index.xml
index b0f0b37f27..33bbbac919 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_region.xml
index daa236daf6..a9c121dc1e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_region.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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_street_address.xml
index a75aaa75b2..b1a21fca23 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_street_address.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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
index fc4bb197b7..652e68ed3a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_translated_id.xml
index c7a07dab38..d8cbc86f2f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_translated_id.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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_zip_code.xml
index 83c03fbf9c..de79d1bbc3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_zip_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml
index b07143f798..39d3448410 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_description.xml
index 168eb1fff6..52eaaafe6a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_file.xml
index 7265a5018a..8ecefdb96f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_file.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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_source_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_source_reference.xml
index f39bc5b6eb..3811a275e3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_source_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_source_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_thumbnail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_thumbnail.xml
index 1f40f236a6..76283775bf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_thumbnail.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_thumbnail.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_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_title.xml
index d31b9ace77..36facfb28d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_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_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
index fd0f3398a8..cd8f5381ad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.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_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage/my_full_sized_image.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage/my_full_sized_image.xml
index 06ec1ec7b1..3bc85ae0dc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage/my_full_sized_image.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage/my_full_sized_image.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_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml
index 1aa59e13b2..c84b674509 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_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_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_description.xml
index 6a0b7a294b..90c83f12ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_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_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml
index 9070eccdbe..5550c2e5ee 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_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>
@@ -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_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view.xml
index ddea7e8684..59f7b924ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_collect_order_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_collect_order_group.xml
index c427473a3c..9d36db72f9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_collect_order_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_collect_order_group.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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_description.xml
index 6a0b7a294b..90c83f12ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_divergence_scope.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_divergence_scope.xml
index d3147b80c4..c0e1dc58b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_divergence_scope.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_divergence_scope.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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml
index 4509299fba..b3aaf344e1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml
index a10c6dba22..a0c4980e26 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_portal_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_portal_type.xml
index 0ed04989e1..7126d7c1b9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_portal_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_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_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/Movement_getDivergenceListMessage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Movement_getDivergenceListMessage.xml
index 3b9343aadf..1ed0ea9c41 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Movement_getDivergenceListMessage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Movement_getDivergenceListMessage.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml
index f572586afa..befd95f41a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml
index 1cc3b37694..f53c7589ac 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessageModule_viewNotificationMessageList/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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml
index bf5ec4e8b7..cc09ee18bc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_aggregate_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_aggregate_title_list.xml
index 2d7e94e903..10d86a6872 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_aggregate_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_aggregate_title_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>
@@ -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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_description.xml
index d7bc75a1db..3fb8f0e90c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_function_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_function_list.xml
index 1d1d353861..79536f6fb8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_function_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_function_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_group_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_group_list.xml
index 786066a611..f07a948e78 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_group_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_group_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml
index 3f0de942e6..8de3188314 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_language.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml
index 294212529a..63f35ba89e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_site_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_site_list.xml
index 9ac8ae427d..88e00a0412 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_site_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_site_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_title.xml
index ea78bd553c..0397f4f20c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml
index 866596087e..6f580a4ddb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_view/my_version.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList.xml
index 8894752cb4..c8c23319ca 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/listbox.xml
index ba9c66037b..e947484ecf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -528,10 +525,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_reference.xml
index d4f77123fa..3d1f1c9c7f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/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>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewContentList/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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor.xml
index 59abe0399f..4dd5abdfbc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_content_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_content_type.xml
index 31b5e8f9e2..044bb2b8ea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_content_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_content_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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml
index 9d37c94917..33ba4bc25f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.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_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content_substitution_mapping_method_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content_substitution_mapping_method_id.xml
index aa416a11f4..be457f701e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content_substitution_mapping_method_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content_substitution_mapping_method_id.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view.xml
index cf78800190..4cd4e9abb5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox.xml
index a7015374f8..06a3f4fe95 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_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>
@@ -185,10 +182,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_int_index.xml
index b3ba7f404e..8c133576de 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_tested_property.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_tested_property.xml
index 5c9bcaee73..911200b237 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_tested_property.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_tested_property.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_update_always.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_update_always.xml
index 54c9066b8e..02fdf7d3ba 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_update_always.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/listbox_update_always.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_comment.xml
index fbd49344dc..90ce5f9508 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_after_generation_script_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_after_generation_script_id.xml
index 1801051104..f047737a01 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_after_generation_script_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_after_generation_script_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_portal_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_portal_type.xml
index 3c86f1b358..eeaf6ba77f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_portal_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_portal_type.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_separate_order_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_separate_order_list.xml
index 4fe0fe72f9..41d6e33679 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_separate_order_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_cell_separate_order_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_line_portal_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_line_portal_type.xml
index 31461ab537..84b45cfbb2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_line_portal_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_line_portal_type.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module.xml
index 8613262443..480e4c229b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module_before_building_script_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module_before_building_script_id.xml
index dcadde95b5..70e0102f5f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module_before_building_script_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_module_before_building_script_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_portal_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_portal_type.xml
index 4ee7b2e7ff..9fbb3f0090 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_portal_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_delivery_portal_type.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_description.xml
index 2eaaf13227..7ba9d9eab6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_id.xml
index fd3771d947..0e828c6c0a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_simulation_select_method_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_simulation_select_method_id.xml
index 4e8ee869fc..d5c5f8f45f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_simulation_select_method_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_simulation_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_title.xml
index 59e9d94164..4e7eb83151 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile.xml
index e4e2498a61..f18b1e6dce 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile.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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_section_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_section_title.xml
index 74b8e3eab2..a99ff2ae6b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_section_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_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_title.xml
index 13544e3d3a..23bd5f4d5a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrderBuilder_viewProfile/my_destination_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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
index c255f32211..7694544e60 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
index 3591e90281..09932f5b9f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
index 2c38286810..ea71f96799 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Description.xml
index f19ea6699f..b82f539d50 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Description.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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Title.xml
index 3841994eab..3edd8aa2b8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_Title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_id.xml
index 73cad7c626..53478e3dea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog/my_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
index fcb37123de..7f2940c90c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
index 0a02171269..f56de1f24e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml
index 911e9934bd..d4b3092f58 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_corporate_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_corporate_name.xml
index 85a9c6c717..cfcf6b4eea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_corporate_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_corporate_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_city.xml
index 78039f43f5..f4785fdfde 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_region.xml
index a1e6b3429a..03216b5808 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_region.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_street_address.xml
index 1cf5e0b663..b144bbc761 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_street_address.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_zip_code.xml
index e8949b2f10..723d9d0789 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_address_zip_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_text.xml
index 64418ffc69..ba37ab511f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_fax_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_fax_text.xml
index a62cdf55ad..56a7113d18 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_fax_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_fax_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
index 30f9a877e3..3dc5c901b9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_function.xml
index aac8f7d814..11356a1a27 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_function.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml
index dec584d29b..812f221054 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_group.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml
index cc02a1ad04..ae7eb328ef 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_role_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml
index b11b27476e..be7b73fd66 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_site.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_title.xml
index c6a22d0007..0acd282430 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
index 6801501bc7..4ac1595313 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
index d2e2c2bc6c..e00b7e29cc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml
index 27275edd67..8f6fdc4ca1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml
index 9d04ea8e0b..426744e09a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_activity_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_activity_code.xml
index cbe7778a7b..d8b92ec4c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_activity_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_activity_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_corporate_registration_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_corporate_registration_code.xml
index 2101669f4a..2ef4aca98c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_corporate_registration_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_corporate_registration_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_absolute_url.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_absolute_url.xml
index 243db9cf40..91f3558c15 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_absolute_url.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_absolute_url.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_file.xml
index 0d61e9012d..1aa6be6fa5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_default_image_file.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_ean13_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_ean13_code.xml
index 08a8db773b..d7573d8375 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_ean13_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_ean13_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml
index a88da52d8b..969c734610 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_geographic_incorporate_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_skill_list.xml
index 756225b1b7..d07e438bea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_skill_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_capital.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_capital.xml
index 6f417b0ef8..6b5174b9fc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_capital.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_capital.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_code.xml
index 0d6e62bfe3..6ce2da3c2e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_form.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_form.xml
index 77d839f2c7..1644cb8879 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_form.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_social_form.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml
index f558fbf694..3d94881bf0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_title.xml
index 2f257f976a..cb613f6458 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_vat_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_vat_code.xml
index 987e0d98f2..1f435f6ce1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_vat_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_vat_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
index 57ba845fc9..6ace1d5384 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml
index b9e780d18f..6eb17e19de 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
index afbe71ac9b..7a42527457 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
index 710d3ea1b7..f9f7316725 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
index 24c1b30e04..3f1a949f67 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
index d28830525b..748547414b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_economical_class.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_economical_class.xml
index ef1e0f6db8..4fafa3f297 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_economical_class.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_economical_class.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
index 7ead06eb2c..54c8b6d3c3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
index 1a59b1556c..64545b079c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
index f14c7e878b..52e33a763c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
index d029651590..af3a24e3fa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
index 2eafcc7dd5..22f88ab632 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml
index 3a2628a70c..c6d39bdf5b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_capital.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_capital.xml
index 4ab800d6e9..e1565b6a3e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_capital.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_capital.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
index fd37bba891..1dd59bffa7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml
index ac14947b14..0c60299839 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
index 50abd49ed7..4813b85b0e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
index d243bf2770..60a1e2ced4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
index d92f71bb48..0b7c236908 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml
index 8906b9d38d..49b95db2a4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox.xml
index 567074131d..1137cb8a02 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list.xml
index 7135187581..c2be79d8b9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_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>
@@ -208,10 +205,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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_start_date.xml
index 5e704cee0f..7d324fe820 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_stop_date.xml
index e52b5177fe..faa2a39f48 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_period_list_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_start_date.xml
index 6b47262143..1baf15988f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_stop_date.xml
index c5bd6ada5f..69c5185205 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
index 96d9954633..bd4ba3b09d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_title.xml
index 2f257f976a..cb613f6458 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/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_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
index 982ed4f295..ddb03e8eb9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <html>\n
   <head>\n
@@ -83,7 +80,7 @@
   </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -97,9 +94,13 @@
             <key> <string>id</string> </key>
             <value> <string>PersonModule_viewCareerLogAsHTML</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
index 25b80f4033..518ec77c6d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.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_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
index b8907fc498..c9b8fc63a5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
index 5c3f3aabf3..112fd1222b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
index 31199f2cc9..989975a004 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
index d097b489e7..bf74a03a27 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAge.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAvailableAssignmentValueList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAvailableAssignmentValueList.xml
index b32ef31ba0..fb784afbde 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAvailableAssignmentValueList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getAvailableAssignmentValueList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml
index 0f43a5e2a7..fedf94e048 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml
index de16060711..772f7c83c2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedCareerList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
index 1e485b78fd..1f57c76ff7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml
index 7fbf7aeff3..e19466c4a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedEventList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml
index bb440b8328..4c8638ae3a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedReportSectionList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
index dc0037cec3..dc2d556ab1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
index c930de7ffb..d555637859 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
index 037cdbdfa7..91395e302b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
index 9ec96b5344..275191ab46 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml
index f76e665d78..4b8d4f3da0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
index a2ed043946..538e717662 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
index 6ce22d7fe6..580bc6031c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml
index 4df457ffc0..a7af6d3476 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
index 4ad172ec44..6063d93db1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml
index 27275edd67..8f6fdc4ca1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml
index 9d04ea8e0b..426744e09a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
index 606bf4a689..69c91b3e1f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
index e99d5c851f..f1f0c1d373 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_product_line_list.xml
index 42dbb04512..577a9070bb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_product_line_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role_list.xml
index f1413379c3..da617f148c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_subordination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_subordination_title.xml
index aee969f537..534405feea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_subordination_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_city.xml
index 78039f43f5..f4785fdfde 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml
index 0f801d933f..5a18961393 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_region.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_street_address.xml
index 1cf5e0b663..b144bbc761 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_street_address.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_zip_code.xml
index e8949b2f10..723d9d0789 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_address_zip_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_text.xml
index 64418ffc69..ba37ab511f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
index aa045b502a..8c2ac85ee2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
index 552bd7a9b2..8256c5c301 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_first_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_first_name.xml
index e6c95faecb..51ad692bd6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_first_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_first_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml
index 72146d6d21..a413036f79 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_last_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_last_name.xml
index fae5d9498b..162f624c82 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_last_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_last_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
index 6f5f480ab8..dd03c3f361 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml
index d41fa67fe8..310260bdfa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml
index e652ca56f4..e7094bac17 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox.xml
index 6dd17e361e..ed38863018 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_start_date.xml
index 77c198a69c..6304989f4a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_stop_date.xml
index 8930543ee2..658830de30 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_password.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_password.xml
index 27bf9d6dae..a0fa4c17e3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_password.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_password.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
index 55e11cc48e..781658a2e2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
index e20558b0b1..2b2c570ae3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
index 3552367a18..fac8426ff3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog.xml
index 00ddfa6ccd..d0213c4e6c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/my_workflow_action.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/my_workflow_action.xml
index e2df2e5d76..5ea57175b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/my_workflow_action.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/my_workflow_action.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password.xml
index 7239e7a113..c7d4334e2d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password_confirm.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password_confirm.xml
index fcdde19bcf..d4a19145e2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password_confirm.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_password_confirm.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_reference.xml
index 167bf54f21..ee3105b0e3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCreateUserActionDialog/your_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml
index 5a59d75c07..e81cf613f3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
index 953d994be2..864514114f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_function.xml
index f6ab7fdd91..2d87b904f6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_function.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>
@@ -138,10 +132,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_start_date.xml
index 69f01a8e0f..5f1fe5205e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_stop_date.xml
index b7d0ab6746..9b1305c077 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_title.xml
index 3e0052c2af..ef29be40b4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birth_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birth_name.xml
index e1a3f2857d..4c8f16a1ad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birth_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_birth_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_collective_agreement_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_collective_agreement_title.xml
index cdc94b30e3..cbdf591dfa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_collective_agreement_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_collective_agreement_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_grade.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_grade.xml
index 88c82a1fe9..a5e6f435c3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_grade.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_reference.xml
index c8540244c5..a2f23bdb76 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_coefficient.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_coefficient.xml
index c865b8947d..439c7998c7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_coefficient.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_coefficient.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_level.xml
index 23c09d128f..314eb28bc0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_salary_level.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_skill_list.xml
index b912c240ea..d9d7d77dcc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_skill_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_title.xml
index 3527875277..fa08d41816 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_career_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_child_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_child_count.xml
index 3e6c91a7c2..a2e35645f2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_child_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_child_count.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml
index 88fb16214d..96960aae56 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_birthplace_address_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_absolute_url.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_absolute_url.xml
index 7220051f54..5a0a9f0220 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_absolute_url.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_absolute_url.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_file.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_file.xml
index 9040c2281a..1d29a5dd2e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_file.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_default_image_file.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_head_of_family.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_head_of_family.xml
index 7ac79da11b..41bf01492c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_head_of_family.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_head_of_family.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_marital_status.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_marital_status.xml
index bd223442b1..12a45c05b9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_marital_status.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_marital_status.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_middle_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_middle_name.xml
index 13d1dfaf58..0795e21629 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_middle_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_middle_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_partner_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_partner_count.xml
index 1ae57ec996..8a73dec45c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_partner_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_partner_count.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_prefix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_prefix.xml
index 4f8b4711d0..2a8442be80 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_prefix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_prefix.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_social_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_social_code.xml
index ee49ec9f9e..21dbd7764a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_social_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_social_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_start_date.xml
index 3300646ae4..ae78771715 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_suffix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_suffix.xml
index dcd0462805..3a1c10d507 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_suffix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_suffix.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
index e20558b0b1..2b2c570ae3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
index 86bc8eb14a..2724408dbc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
index f0e57e0094..f365e9d2aa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
index d3a1fd4260..1fbdc9d19a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.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>
@@ -133,10 +130,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>
@@ -149,10 +143,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
index 11ba9c89f1..adc3305730 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
index b3a88b420e..0bead684dc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_head_of_family.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_head_of_family.xml
index d42e1caae6..b5ce131aae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_head_of_family.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_head_of_family.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
index 268010e3dc..6a8151ef2d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
index 953c2eef44..2e87aeb064 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
index 2056fe7ec7..c3c83407b0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml
index bb0da40239..9562781714 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
index ff5789aea4..0d45b123fc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.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>
@@ -133,10 +130,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>
@@ -149,10 +143,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_password.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_password.xml
index b4f10ffe51..44519706e7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_password.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_password.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
index 0e8e3874e0..455ec4ef3b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
index 2d3c11b583..987486d01a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
index c7766ce555..8c85779027 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
index 76f3c57044..0152d6e3f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
index 795970e82a..513651c4d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml
index 638ca42c64..463fc275de 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox.xml
index 567074131d..1137cb8a02 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_start_date.xml
index 6b47262143..1baf15988f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_stop_date.xml
index c5bd6ada5f..69c5185205 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/my_title.xml
index e20558b0b1..2b2c570ae3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList.xml
index edae6c0f8b..1b1d60d1cc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox.xml
index 605463203e..a69a700b19 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/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>
@@ -176,10 +173,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_start_date.xml
index 69f01a8e0f..5f1fe5205e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_stop_date.xml
index b7d0ab6746..9b1305c077 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_stop_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_title.xml
index 3e0052c2af..ef29be40b4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCareerList/listbox_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus.xml
index 043273d0b9..c42f9a56b2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_activity.xml
index 606bf4a689..69c91b3e1f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_activity.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_function.xml
index e99d5c851f..f1f0c1d373 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_function.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_product_line_list.xml
index 42dbb04512..577a9070bb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_product_line_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_role_list.xml
index f1413379c3..da617f148c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_role_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_subordination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_subordination_title.xml
index 53f30cefc8..a9449078a3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_career_subordination_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_city.xml
index 78039f43f5..f4785fdfde 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_region.xml
index 0f801d933f..5a18961393 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_region.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_street_address.xml
index 1cf5e0b663..b144bbc761 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_street_address.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_zip_code.xml
index e8949b2f10..723d9d0789 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_address_zip_code.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_email_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_email_text.xml
index 64418ffc69..ba37ab511f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_email_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_email_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_fax_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_fax_text.xml
index aa045b502a..8c2ac85ee2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_fax_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_fax_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_telephone_text.xml
index 552bd7a9b2..8256c5c301 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_default_telephone_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_description.xml
index 7dd1272e2d..8bf06a10da 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_first_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_first_name.xml
index e6c95faecb..51ad692bd6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_first_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_first_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_gender.xml
index 72146d6d21..a413036f79 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_gender.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_gender.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_last_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_last_name.xml
index fae5d9498b..162f624c82 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_last_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_last_name.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_mobile_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_mobile_telephone_text.xml
index 6f5f480ab8..dd03c3f361 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_mobile_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_mobile_telephone_text.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_nationality.xml
index d41fa67fe8..310260bdfa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_nationality.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_nationality.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedCivilStatus/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList.xml
index d65138aee5..df79926c20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList/listbox.xml
index 51c65f4a2e..2fca8e3a81 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedContributionList/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>
@@ -197,10 +194,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>
@@ -213,10 +207,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>
@@ -229,10 +220,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList.xml
index ffb94a334e..dd2bab3285 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml
index 2dd973832b..6e33b99e74 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/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>
@@ -193,10 +190,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_delivery_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_delivery_start_date.xml
index a98936806f..c33add5cad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_delivery_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_delivery_start_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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_destination_title.xml
index 10380eb989..4a1d6f980c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedEventList/listbox_destination_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>
@@ -128,10 +125,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport.xml
index 3f4b150fb6..4cecd006a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_aggregation_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_aggregation_level.xml
index 3e9f92fa76..2c99006e6e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_aggregation_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_aggregation_level.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>
@@ -150,10 +147,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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_at_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_at_date.xml
index 49f30fa4a2..970553d428 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_at_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_from_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_from_date.xml
index 48a770f702..d5dc82717e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_from_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_reportbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_reportbox.xml
index 7d3b21c176..824cd291e5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_reportbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReport/your_reportbox.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog.xml
index e0cedff750..388efbc098 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_aggregation_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_aggregation_level.xml
index eef80467c1..5c738a4e62 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_aggregation_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_aggregation_level.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_at_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_at_date.xml
index 96711339c4..28a6b7145f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_at_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_deferred_style.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_deferred_style.xml
index 0d330295cc..07ae06026f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_deferred_style.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_format.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_format.xml
index 5cf39f9d6b..9d3b34cd2a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_format.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/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>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_from_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_from_date.xml
index ba771fcdd8..61fd9e60cc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_from_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_portal_skin.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_portal_skin.xml
index fcfa8e62f9..46dea8f260 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_portal_skin.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPersonDetailedReportDialog/your_portal_skin.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_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference.xml
index 147d1c013a..bc8707b676 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference.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_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_area_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_area_number.xml
index ddbf08fef6..5183c8195a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_area_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_area_number.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_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_city_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_city_number.xml
index 85850a0ca6..eea27e9891 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_city_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_city_number.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_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_country_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_country_number.xml
index dfdba6c08c..77b9d623d2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_country_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Preference_viewBasePreference/my_preferred_telephone_default_country_number.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view.xml
index 7ea06f8513..1315d7c43f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_collect_order_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_collect_order_group.xml
index c427473a3c..9d36db72f9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_collect_order_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_collect_order_group.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_description.xml
index 6a0b7a294b..90c83f12ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_divergence_scope.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_divergence_scope.xml
index d3147b80c4..c0e1dc58b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_divergence_scope.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_divergence_scope.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_grouping_method.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_grouping_method.xml
index 7882fa1cbb..75493e2240 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_grouping_method.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_grouping_method.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml
index 4509299fba..b3aaf344e1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml
index a10c6dba22..a0c4980e26 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_tested_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_tested_property_list.xml
index 6169ae76d1..8e473a316d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_tested_property_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_tested_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml
index e9eb9407a0..0eee3e7416 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_collect_order_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_collect_order_group.xml
index c427473a3c..9d36db72f9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_collect_order_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_collect_order_group.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_description.xml
index 6a0b7a294b..90c83f12ae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_divergence_scope.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_divergence_scope.xml
index d3147b80c4..c0e1dc58b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_divergence_scope.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_divergence_scope.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml
index 4509299fba..b3aaf344e1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml
index a10c6dba22..a0c4980e26 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_tested_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_tested_property_list.xml
index 6169ae76d1..8e473a316d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_tested_property_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_tested_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_title.xml
index 6b82ce9ff2..d619932135 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_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_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml
index 20ff39b554..b73c090852 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.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_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml
index 77f1ff4c04..e2ec25c3ef 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.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_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList/listbox.xml
index e961cbe96b..a42beba7a6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml
index d92d3e6c23..eb476f9f2b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_agent_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_agent_title.xml
index 0ad70e2392..efda49e4e2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_agent_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_description.xml
index cc2fc31534..b027e3ed3f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_owner.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_owner.xml
index bde01ac35c..d9402d80c1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_owner.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_owner.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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_text_content.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_text_content.xml
index 62f5665207..ff487d7b0e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_text_content.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_text_content.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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_title.xml
index bc7862c0d8..8e2373e259 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_translated_validation_state_title.xml
index 0c03d503d7..2df1792813 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view/my_translated_validation_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml
index 0577d08def..0ca02ce02e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getAgentListAsString.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.xml
index 4e06638b5f..eb5c5911e6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml
index d31112917c..1a317cda9a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_agent_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_agent_title_list.xml
index 7e1a6b9619..3f5b7d2862 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_agent_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_agent_title_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_role_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_role_name.xml
index 66cc8dd463..100a8216ea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_role_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_role_name.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_title.xml
index 7315539e8e..abbecda9aa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
index f225df0158..c0cf7a9f5f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
index 70a057c46b..64265774d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
index a3af5581c0..7f1c4bebda 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
index 9f33606d8a..ecdef97826 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.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>
@@ -268,10 +265,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>
@@ -284,10 +278,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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_reference.xml
index d4f77123fa..3d1f1c9c7f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/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>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.xml
index 64a54ec9ea..9f7d06683a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.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>
@@ -124,10 +121,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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
index 928b5862d0..37c737f3a5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.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>
@@ -268,10 +265,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>
@@ -284,10 +278,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_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList.xml
index 2822cd2b00..9a0f1e9e25 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList.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_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList/listbox.xml
index 731fb0ccef..1cdc70a7f8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoundingTool_viewRoundingModelList/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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view.xml
index 428941d9e1..6071f5de6f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_title.xml
index ed5b49f72a..0de8bb3d7e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_causality_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>
@@ -126,10 +123,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_comment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_comment.xml
index 06555dcada..9a170e82c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_comment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_comment.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
index 6634b6141c..52c03b7d64 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.xml
index d1e79c740f..e134c405e6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_solver.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.xml
index c92aa7dfb7..d02f267b13 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml
index df451746dc..fbf9e8fb08 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_viewConfiguration/my_configuration.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FormBox" module="Products.ERP5Form.FormBox"/>
-        <tuple/>
-      </tuple>
+      <global name="FormBox" module="Products.ERP5Form.FormBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -176,10 +173,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view.xml
index a6b20ee7ad..9093b157fe 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox.xml
index c41f831c99..78db5028c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -554,10 +551,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_configuration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_configuration.xml
index 64f4e942c5..65d730a3ce 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_configuration.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_configuration.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_solver.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_solver.xml
index ed6ae14d9c..31bf9d7f31 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_solver.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/listbox_solver.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_title.xml
index 52c14350f1..c5bf384370 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_translated_validation_state_title.xml
index 318a78b44e..c001a3cb33 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox.xml
index 282fe29145..ae2a72cade 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_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>
@@ -148,10 +145,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox_configuration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox_configuration.xml
index de5e96c263..3d2a47c907 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox_configuration.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverProcess_view/solver_listbox_configuration.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml
index bedaedbbda..00d66a828f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_id.xml
index 4b233d6a48..ba8b3f04c9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_translated_validation_state_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_acquire_local_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_acquire_local_role.xml
index d2d83b2669..a748ff0b04 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_acquire_local_role.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_acquire_local_role.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_add_permission.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_add_permission.xml
index 7e3fe5c676..0e2c6c6cd7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_add_permission.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_add_permission.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_allowed_content_type_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_allowed_content_type_list.xml
index 42e6c3d878..4e46f661de 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_allowed_content_type_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_allowed_content_type_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_base_category_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_base_category_list.xml
index a7a1714b4d..c1b287dd72 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_base_category_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_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>
@@ -111,10 +108,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_factory_method_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_factory_method_id.xml
index dad120f50b..8d7976873f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_factory_method_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_factory_method_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_filter_content_type.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_filter_content_type.xml
index d643580f1f..0646186505 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_filter_content_type.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_filter_content_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_group_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_group_list.xml
index 4ddd32dfdf..b6081e6dce 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_group_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_group_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>
@@ -111,10 +108,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_hidden_content_type_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_hidden_content_type_list.xml
index bbfed0ea54..104c2fea53 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_hidden_content_type_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_hidden_content_type_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_icon.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_icon.xml
index 8fc2e79d6d..1d80915f69 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_icon.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_icon.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_init_script_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_init_script_id.xml
index 2851ca9cc1..5a4a2dceae 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_init_script_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_init_script_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_property_sheet_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_property_sheet_list.xml
index 4a1ec2d193..a688987ac9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_property_sheet_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view/my_type_property_sheet_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>
@@ -111,10 +108,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration.xml
index ef61bceeff..4333abbefe 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_automatic_solver.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_automatic_solver.xml
index 376d1afe50..9b3512312f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_automatic_solver.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_automatic_solver.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_form_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_form_id.xml
index 41653aa3cc..e4a62bff20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_form_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_form_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_groupable.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_groupable.xml
index 4f045c6eca..eaff373046 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_groupable.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_groupable.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_property_list_dict_method_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_property_list_dict_method_id.xml
index 31bb866d22..971e366842 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_property_list_dict_method_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_configuration_property_list_dict_method_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_conflicting_solver_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_conflicting_solver_list.xml
index 68b855a6b1..dc1f6d48ad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_conflicting_solver_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_conflicting_solver_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>
@@ -137,10 +134,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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_default_configuration_property_dict_method_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_default_configuration_property_dict_method_id.xml
index 34aaac552c..2006fd569b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_default_configuration_property_dict_method_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_default_configuration_property_dict_method_id.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_delivery_solver_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_delivery_solver_list.xml
index 3886594a57..793404f6a1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_delivery_solver_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_delivery_solver_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>
@@ -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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_exclusive.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_exclusive.xml
index 79c79f656f..13730cdeb3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_exclusive.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_exclusive.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_groupable.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_groupable.xml
index f7e9ed0841..9fc2609ae3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_groupable.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_line_groupable.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_process_exclusive.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_process_exclusive.xml
index 90e7cb2ae8..e8828db5ea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_process_exclusive.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_process_exclusive.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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_solver_action_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_solver_action_title.xml
index 0a1c37dae9..15d623e10e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_solver_action_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_solver_action_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_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_tested_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_tested_property_list.xml
index 5bfa899248..1e6973ce4d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_tested_property_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_viewConfiguration/my_tested_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_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyDict.xml
index 84a29d330f..7d6127134e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyDict.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_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyListDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyListDict.xml
index 1cb951c6cf..9e157f26bc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyListDict.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Solver_getDefaultConfigurationPropertyListDict.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
index 6aeb2db2eb..3e54d7605d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_description.xml
index 622145839f..b65a02400c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_int_index.xml
index 17ffa72f49..75669ef998 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_area.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_area.xml
index 3d9c830f82..ef2e8859c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_area.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_area.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_city.xml
index 23fd44d660..5930554974 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_country.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_country.xml
index bc34527002..491b225a27 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_country.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_country.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_extension.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_extension.xml
index 9fa4cca711..1276d4b694 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_extension.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_extension.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_number.xml
index aa975a0f16..d749af0b1f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_telephone_number.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_title.xml
index fc4bb197b7..652e68ed3a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_translated_id.xml
index c7a07dab38..d8cbc86f2f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view/my_translated_id.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
index 3c9d28ee35..3444c7a8c2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
index b8999d3644..4db7775ae4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_city.xml
index 4cc04de190..4e7bcfd187 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_city.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
index d8e46e7544..c66465d027 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
index b976297200..7fe9d73e53 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
index 0ceccf2624..c43e98e6e4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
index 44e46c1922..4d23f37bad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_description.xml
index 622145839f..b65a02400c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_int_index.xml
index 17ffa72f49..75669ef998 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_title.xml
index 0a5abd3ff1..b31664c16a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_translated_id.xml
index c7a07dab38..d8cbc86f2f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_translated_id.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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
index f590e218bf..9262a54b2a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.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_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
index fb3b731a5e..dd8efa210d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
index 10a02e8bbb..de11dd4fad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
index 36ef304fbf..ad4d2bee0c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.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_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
index df7f50ab5b..32b7fad804 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/ToolTemplateItem/portal_introspections.xml b/bt5/erp5_base/ToolTemplateItem/portal_introspections.xml
index 87f0d4de96..14242678b0 100644
--- a/bt5/erp5_base/ToolTemplateItem/portal_introspections.xml
+++ b/bt5/erp5_base/ToolTemplateItem/portal_introspections.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="IntrospectionTool" module="Products.ERP5.Tool.IntrospectionTool"/>
-        <tuple/>
-      </tuple>
+      <global name="IntrospectionTool" module="Products.ERP5.Tool.IntrospectionTool"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/ToolTemplateItem/portal_roundings.xml b/bt5/erp5_base/ToolTemplateItem/portal_roundings.xml
index be1c6c62e8..623020403b 100644
--- a/bt5/erp5_base/ToolTemplateItem/portal_roundings.xml
+++ b/bt5/erp5_base/ToolTemplateItem/portal_roundings.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RoundingTool" module="Products.ERP5.Tool.RoundingTool"/>
-        <tuple/>
-      </tuple>
+      <global name="RoundingTool" module="Products.ERP5.Tool.RoundingTool"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -46,7 +43,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -54,7 +51,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml b/bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml
index 17be3224b3..2bc26f0d0c 100644
--- a/bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml
+++ b/bt5/erp5_base/ToolTemplateItem/portal_solver_processes.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SolverProcessTool" module="Products.ERP5.Tool.SolverProcessTool"/>
-        <tuple/>
-      </tuple>
+      <global name="SolverProcessTool" module="Products.ERP5.Tool.SolverProcessTool"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -58,7 +55,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -66,7 +63,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/ToolTemplateItem/portal_solvers.xml b/bt5/erp5_base/ToolTemplateItem/portal_solvers.xml
index 6e80af5aea..7b1fea0986 100644
--- a/bt5/erp5_base/ToolTemplateItem/portal_solvers.xml
+++ b/bt5/erp5_base/ToolTemplateItem/portal_solvers.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SolverTool" module="Products.ERP5.Tool.SolverTool"/>
-        <tuple/>
-      </tuple>
+      <global name="SolverTool" module="Products.ERP5.Tool.SolverTool"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -46,7 +43,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -54,7 +51,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_base/ToolTemplateItem/portal_web_services.xml b/bt5/erp5_base/ToolTemplateItem/portal_web_services.xml
index c9def1d167..97295ab1f6 100644
--- a/bt5/erp5_base/ToolTemplateItem/portal_web_services.xml
+++ b/bt5/erp5_base/ToolTemplateItem/portal_web_services.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="WebServiceTool" module="Products.ERP5Type.Tool.WebServiceTool"/>
-        <tuple/>
-      </tuple>
+      <global name="WebServiceTool" module="Products.ERP5Type.Tool.WebServiceTool"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml
index 86faaa111f..241ea86aad 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
index 7ebcb950cb..288ccc08ce 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml
index 710340fb1a..94e6111b26 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
index 9e2798291a..45d6e26494 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/cancelled.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/cancelled.xml
index 8cc629ae52..1f1d88e4dd 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/cancelled.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/closed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/closed.xml
index 71f340600b..b7330c8551 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/closed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/closed.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/deleted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/deleted.xml
index 6b63740eee..abe5cd3e74 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/deleted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/draft.xml
index 7c3cf98045..054fabf8e3 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/open.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/open.xml
index 9022906783..18f957a2c2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/open.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/open.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>
@@ -51,10 +48,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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/updated.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/updated.xml
index 46d6424448..e97edc182e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/updated.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/states/updated.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml
index be6de1cfdd..4ad6058128 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml
index 61c3821d78..93c1e90ab4 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close.xml
index 80a0c15337..c9302f546b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml
index 9ca848d7dc..9a2dd268c2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml
index 32c21af2cc..eac3e16e82 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml
index 494b66f587..5406e7a26f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml
index b3b1df4cb7..33d1cd9dba 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml
index 24b43ab4c2..2bcee12ead 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml
index 4dbcd2b8be..a568c37b20 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/error_message.xml
index e89715783d..69512a44bc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_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_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
index aaad78ee93..ca0988b80e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkConsistency.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkConsistency.xml
index 956010e89b..1623103a4e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkConsistency.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/cancelled.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/cancelled.xml
index 80efdcbdf3..37e5264e56 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/cancelled.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/closed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/closed.xml
index b28809efd7..858312126e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/closed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/closed.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_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/draft.xml
index a8eec80cd7..a815b2ff4c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/open.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/open.xml
index 2b75c4a625..7a14edfb7e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/open.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/states/open.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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel.xml
index 60bb63c2f1..5fcba89045 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel_action.xml
index 9136a96009..1a0b1172bf 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start.xml
index 4b76aaaa66..953621c75a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start.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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start_action.xml
index 42d1e10fb3..951c59f031 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/start_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop.xml
index e8478d53bc..18b5e26544 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop.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_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop_action.xml
index 68a8c4f9aa..4c645aa364 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/transitions/stop_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/error_message.xml
index e89715783d..69512a44bc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/career_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow.xml
index 708a369c40..e6b0970a1c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions/CurrencyExchangeLine_edit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions/CurrencyExchangeLine_edit.xml
index 4dad8c6dfd..c72fa94b55 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions/CurrencyExchangeLine_edit.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/interactions/CurrencyExchangeLine_edit.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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_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_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow.xml
index f67a705418..456dc0413b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow.xml
index 4e5c40084a..a45fe43326 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_afterEdit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_afterEdit.xml
index 42a9dd4a7f..3a8ae01804 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_afterEdit.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_afterEdit.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSolveDivergenceTransition.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSolveDivergenceTransition.xml
index 0da0253084..07e53c6bd5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSolveDivergenceTransition.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSolveDivergenceTransition.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSplitAndDeferTransition.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSplitAndDeferTransition.xml
index 289e59abb4..9ace2b9c14 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSplitAndDeferTransition.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_callSplitAndDeferTransition.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
index e77ba0fcc9..e57aef5d82 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
index 4d338c3915..53bf9b0d84 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml
index ab822b5a92..315849917c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/building.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/building.xml
index c528726750..4181ab9344 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/building.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/building.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml
index a6099548b6..1b45b44652 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.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>
@@ -50,10 +47,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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/diverged.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/diverged.xml
index 437c8406e7..5f76603722 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/diverged.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/diverged.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>
@@ -54,10 +51,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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/draft.xml
index 0d94d7f440..29db4dd2ab 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solved.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solved.xml
index 55f3956b61..79f1615fb9 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solved.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solved.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>
@@ -50,10 +47,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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solving.xml
index a1821aa40d..fe57912c1a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/solving.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/calculate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/calculate.xml
index 4f6b29f71b..7685ba1390 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/calculate.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/calculate.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/converge.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/converge.xml
index c55a1f15b0..704070ffe8 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/converge.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/converge.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/diverge.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/diverge.xml
index 7032a942ff..f5b15132ec 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/diverge.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/diverge.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_automatically.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_automatically.xml
index 5c290a8fb7..b1636bbee6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_automatically.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_automatically.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence.xml
index b3049ad09d..4ebb3bdf6c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence_action.xml
index f6122ef685..6a835fea9e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/solve_divergence_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>
@@ -88,10 +82,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer.xml
index e8a3c79658..144787dcda 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer_action.xml
index 4768039c35..6ed74da798 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/split_and_defer_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>
@@ -88,10 +82,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/start_building.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/start_building.xml
index 3a08288b66..015ad738d2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/start_building.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/transitions/start_building.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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/portal_type.xml
index a874ecc8bb..521a53aa17 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_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_base/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow.xml
index 79e4f60681..fa1c2443d8 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_causality_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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow.xml
index ecadd37e2a..2a2466023e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable.xml
index c85e3dfbe4..0f7f5d24a1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable.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>
@@ -93,10 +90,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>
@@ -111,10 +105,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable_edit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable_edit.xml
index beb030d011..1e10066b04 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable_edit.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable_edit.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_cached_convertable.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_cached_convertable.xml
index c1cc232e93..d7f75178d5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_cached_convertable.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_cached_convertable.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_file.xml
index cedfa5a075..e9951dc00c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_file.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>
@@ -92,10 +89,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>
@@ -110,10 +104,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_convertToBaseFormat.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_convertToBaseFormat.xml
index 17459ae5a6..8ff70eb69a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_convertToBaseFormat.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_convertToBaseFormat.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_guessMimeType.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_guessMimeType.xml
index b66f58640c..c651c85f94 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_guessMimeType.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_guessMimeType.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_upload.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_upload.xml
index 96408a8418..49fea73b6a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_upload.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/Document_upload.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/OOoDocument_updateMetadata.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/OOoDocument_updateMetadata.xml
index e96a63e955..28e3eae113 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/OOoDocument_updateMetadata.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/scripts/OOoDocument_updateMetadata.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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_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_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow.xml
index 6f06da57cf..e2bad464ee 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml
index 95b440722c..1e2b4dd2a1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml
index d259eff738..69477ad119 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml
index 435aef5b99..6ec500ff87 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/Document_setContributor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/Document_setContributor.xml
index cd4f3e135f..be23fe9e63 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/Document_setContributor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/Document_setContributor.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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/updateLocalRoles.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/updateLocalRoles.xml
index 8231925f71..96c9a2988c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/updateLocalRoles.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/scripts/updateLocalRoles.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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_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_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow.xml
index 428e47c843..a4affc9a16 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRoles.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRoles.xml
index f4b7f2cf2a..e1885c5bdd 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRoles.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRoles.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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRolesBeforeDelete.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRolesBeforeDelete.xml
index e6b0810ee2..63d4274415 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRolesBeforeDelete.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/UpdateLocalRolesBeforeDelete.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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml
index e1ba557468..9c81bb274e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/RoleDefinition_manageBeforeDelete.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/RoleDefinition_manageBeforeDelete.xml
index c20159cc7e..49423e2505 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/RoleDefinition_manageBeforeDelete.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/RoleDefinition_manageBeforeDelete.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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_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_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/local_permission_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_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow.xml
index 1935b50601..202fbe79aa 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_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_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_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_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_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_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_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_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow.xml
index 1198688bde..d41e31fb9f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml
index ef17b83812..a703b14c4c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml
index 8d196c03a5..d4bf406f4d 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml
index 4cbf1cecbe..3ce6ed717f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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>
@@ -51,10 +48,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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml
index ae17f212f1..9701d1d241 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml
index 893a14097c..21614a82d2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete.xml
index 5f50e7e2ff..62d1825c40 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml
index 1277cc1f43..b86207ff33 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml
index 4e8a885055..8458c78266 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml
index 63261830d0..d0f07ae6c9 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject.xml
index 5912524171..57c961f137 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject.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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml
index 17c2ff7521..b99682467e 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit.xml
index 5fec004604..f0c7b07346 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml
index ab335f5930..8e397fee8a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate.xml
index 3b00cece31..0213be4eea 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml
index d80914033e..0d64b3866c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml
index b6ab718b6e..cf9789beee 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
index 63e83eebcc..99dc5a1238 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml
index 0deee79ddd..37beb5e4f4 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml
index 33a2afbc9a..44306b76d7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/portal_type.xml
index d1c833ff18..318e098ff6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml
index 624cc5038c..5a517524ee 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow.xml
index 8f479f095a..90414f133f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_expandAppliedRule.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_expandAppliedRule.xml
index ac712e01af..10e466f0c2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_expandAppliedRule.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_expandAppliedRule.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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_unlinkSimulation.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_unlinkSimulation.xml
index eab05742c9..0dff88cb65 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_unlinkSimulation.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/scripts/OrderMovement_unlinkSimulation.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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_movement_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow.xml
index bf3997e7d3..c36dc3ad42 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/expand_simulation.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/expand_simulation.xml
index b8479dd996..02cb3050ee 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/expand_simulation.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/expand_simulation.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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/reindex_simulation.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/reindex_simulation.xml
index 61dc66efb7..53e9f71654 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/reindex_simulation.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/interactions/reindex_simulation.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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_expandAppliedRule.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_expandAppliedRule.xml
index 0e6b3fe662..30fec66bf0 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_expandAppliedRule.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_expandAppliedRule.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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_reindexAppliedRule.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_reindexAppliedRule.xml
index ee25ee63c4..154b37df2c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_reindexAppliedRule.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/scripts/Order_reindexAppliedRule.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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_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_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/order_simulation_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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow.xml
index 2b8cab18f0..9e1b8dd2dc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onDeleteUserLoginPerson.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onDeleteUserLoginPerson.xml
index 6d9db90449..6cd2d0b3db 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onDeleteUserLoginPerson.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onDeleteUserLoginPerson.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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onRealDeleteUserLoginPerson.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onRealDeleteUserLoginPerson.xml
index f9eca58567..8f724fde2c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onRealDeleteUserLoginPerson.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/ClearContentShortCache_onRealDeleteUserLoginPerson.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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/setReference.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/setReference.xml
index 333ac3eced..16e5c0aaca 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/setReference.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/setReference.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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_clearContentShortCache.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_clearContentShortCache.xml
index 5c1e72890f..4b7b89b957 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_clearContentShortCache.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_clearContentShortCache.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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_createUserPreference.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_createUserPreference.xml
index 441c5cb06c..5ac8aafc99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_createUserPreference.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/Person_createUserPreference.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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_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_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow.xml
index c3a2d0633a..b8aafda496 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts/Document_convertToBaseFormat.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts/Document_convertToBaseFormat.xml
index b7cf2b3732..9b65cccbdc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts/Document_convertToBaseFormat.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/scripts/Document_convertToBaseFormat.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml
index ad38d48c50..216668227b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/conversion_failed.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converted.xml
index 908eb79622..79a3255bb0 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converted.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml
index 266a3512d0..93c7bdc8f6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/converting.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/empty.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/empty.xml
index b4a6c62065..8cda3cdd74 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/empty.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/empty.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/uploaded.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/uploaded.xml
index 9969c1f9b7..dd06b0d4a5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/uploaded.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/states/uploaded.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml
index 2d0b88413e..9595418169 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/conversion_failed.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_action.xml
index 6d00556407..22ba6b6a75 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_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>
@@ -86,10 +80,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_file.xml
index 23ea4adeab..696a3bdcc0 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/convert_file.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_converted_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_converted_file.xml
index 53d01c64a9..d458731c7a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_converted_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_converted_file.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>
@@ -78,10 +72,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_uploaded_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_uploaded_file.xml
index 921dfccb87..e631fee751 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_uploaded_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/detect_uploaded_file.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>
@@ -86,10 +80,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml
index b48393908f..5c5456b523 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_conversion_failed.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_file.xml
index 6b2983c5c5..33259cf684 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/process_file.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>
@@ -78,10 +72,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/update_file_metadata.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/update_file_metadata.xml
index ab3921b277..5472df7a59 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/update_file_metadata.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/update_file_metadata.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/upload_file.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/upload_file.xml
index db063afabf..6102954514 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/upload_file.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/transitions/upload_file.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/action.xml
index df6c2ee67f..7e37362798 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/actor.xml
index f65890149e..41b5adfb2b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/comment.xml
index 5774567823..e22869e0c2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/history.xml
index ac03af9143..c6cb030d70 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/portal_type.xml
index d1c833ff18..318e098ff6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/serial.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/serial.xml
index 5379e57a32..6af4de3c6b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/serial.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/serial.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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/time.xml
index fa51ccb81b..adc65b1ab7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_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_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml
index a8cea21d64..28239cd104 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts/notifyOwner.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts/notifyOwner.xml
index b409161ae0..50fca7bb3a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts/notifyOwner.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/scripts/notifyOwner.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_base/WorkflowTemplateItem/portal_workflow/query_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml
index 7ff826e5ce..bcf452dae7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.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_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml
index dbbbea2094..f669eabc24 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/deleted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/deleted.xml
index b9cb0324fc..2bea418f8b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/deleted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/draft.xml
index 0539e00e14..1e6aaf71e4 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/posted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/posted.xml
index f00447e334..10eb8b64f5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/posted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/posted.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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml
index 2c5dbffe90..4d06f56788 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml
index eb01dd7677..41b9061899 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml
index f291be6405..62bb6c3eea 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml
index 9841f00455..4efff498b2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml
index 42e18608a6..f11d3d9b6b 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml
index 659d7a564f..7dacef34f6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml
index 77ef271e35..7e0eab0b67 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.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_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml
index fc6ba55f63..8e2c583f00 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/error_message.xml
index e89715783d..69512a44bc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/portal_type.xml
index 35cc784b37..b8f440da42 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_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_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists/posted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists/posted.xml
index de6cf0c2f5..9232eb57b8 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists/posted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/worklists/posted.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>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow.xml
index 77424b8cc0..31fe5ee366 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions.xml
index 6788072919..e18bf8cbf7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions/doRecursiveReindex.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions/doRecursiveReindex.xml
index f26e5d9c29..712902a2b4 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions/doRecursiveReindex.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/interactions/doRecursiveReindex.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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts/callRecursiveReindexObject.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts/callRecursiveReindexObject.xml
index 5e6b100c10..6de420570f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts/callRecursiveReindexObject.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/scripts/callRecursiveReindexObject.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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/variables.xml
index 5547232278..6ae03699d1 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_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_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/worklists.xml
index 1f8b17b012..c3432aa051 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/reindex_object_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_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow.xml
index d547f7c24d..2495ae8699 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml
index e629057836..33272b0b1a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml
index 8445e26883..773b61ee63 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml
index 4a62fc2686..205030fb1f 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/failed.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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml
index 65e6953933..4be154caeb 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solved.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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml
index 77c83dcbb0..1913c75bb6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/states/solving.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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml
index ffca7cccab..60a423c784 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/fail.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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml
index d0a293d213..5de11e3a0d 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/start_solving.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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml
index a955c65afc..721bb60150 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/transitions/succeed.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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml
index a874ecc8bb..521a53aa17 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow.xml
index f38082ddf5..537c707969 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml
index 3d1926ddb2..35ec708f39 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_startSolving.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml
index 8ad8660f76..ac6e0deff2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/scripts/SolverProcess_succeed.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml
index af80de7e0e..04c28165d2 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml
index cc0f8c8097..dc1be73e6a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/failed.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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml
index c8f30bce3e..6f94d2b780 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solved.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml
index 69d2d2a5c0..9b6d42f2aa 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/states/solving.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml
index ffca7cccab..60a423c784 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/fail.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml
index 46f12b84e4..06b724195c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/start_solving.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml
index 7eddbac81c..104225d38a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/transitions/succeed.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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml
index ca8bd983f6..535863de2a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml
index a874ecc8bb..521a53aa17 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow.xml
index 76c853aa94..cb3779a2a5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts.xml
index 0622b3c34f..072c8f6540 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_createUser.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_createUser.xml
index f670a01921..cf2aca2b31 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_createUser.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_createUser.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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_verifyUserCreationInput.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_verifyUserCreationInput.xml
index a1d8324ebb..f3dcda554a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_verifyUserCreationInput.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/scripts/UserAccountWorkflow_verifyUserCreationInput.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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states.xml
index a21bb6e959..27ec906902 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states/draft.xml
index 09b3c5440b..fc9ceee24c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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>
@@ -46,10 +43,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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions.xml
index 092a5b48f6..aa36144efe 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions/create_user_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions/create_user_action.xml
index 7ab1d103c6..89b7547db6 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions/create_user_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/transitions/create_user_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>
@@ -88,10 +82,7 @@
   </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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables.xml
index a067e6fbbe..bb12bef805 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/action.xml
index ed306eb6af..e00c871334 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/actor.xml
index d2b89d6051..493f0994f7 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/comment.xml
index 999beb2edb..73cd2e7913 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/error_message.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/error_message.xml
index e89715783d..69512a44bc 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/error_message.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/history.xml
index d7bca55728..e0fe339d69 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/portal_type.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/portal_type.xml
index a874ecc8bb..521a53aa17 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/portal_type.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/time.xml
index 0364a3b135..5ae6932d99 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/worklists.xml
index 40787ac9e4..c7242ee114 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_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_base/bt/revision b/bt5/erp5_base/bt/revision
index 9c574c9538..523780a1a7 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-893
\ No newline at end of file
+894
\ No newline at end of file
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/brand.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/brand.xml
index 98b2afee08..6f25251070 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/brand.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/brand.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/cleaning_code.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/cleaning_code.xml
index 44ecd3db91..0f39aac7f9 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/cleaning_code.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/cleaning_code.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/collection.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/collection.xml
index 52da312c7d..46b55267ba 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/collection.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/collection.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
index 4d15171b03..67d1aa5428 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/composition.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/composition.xml
index 84d454784b..8c7b83fb7f 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/composition.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/composition.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/feature.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/feature.xml
index 0a8f83d5b0..560772a22b 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/feature.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/feature.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/image.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/image.xml
index 93425b4622..59348fcf80 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/image.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/image.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/measure.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/measure.xml
index e12d6c0536..f3fb5a9458 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/measure.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/measure.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/metric_type.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/metric_type.xml
index 17e7ad65f1..b986e112b0 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/metric_type.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/metric_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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml
index 577f947fcc..2ee840d55c 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.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>
@@ -184,7 +181,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -192,7 +189,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/operation.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/operation.xml
index 0e7a3e94d7..84a18e8ab7 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/operation.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/operation.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_pdm/CategoryTemplateItem/portal_categories/option.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/option.xml
index 3958c1bec4..fda73e7f15 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/option.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/option.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_pdm/CategoryTemplateItem/portal_categories/pricing.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/pricing.xml
index bf34f11bbd..8f57907724 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/pricing.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/pricing.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_pdm/CategoryTemplateItem/portal_categories/segment.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/segment.xml
index 4ca9fd2ef4..9ea56db47c 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/segment.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/segment.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>
@@ -182,7 +179,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -190,7 +187,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/shape.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/shape.xml
index 5d46385c97..ae5b837998 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/shape.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/shape.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>
@@ -180,7 +177,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -188,7 +185,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/tariff_nomenclature.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/tariff_nomenclature.xml
index 6f5e4e5396..a5c4148432 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/tariff_nomenclature.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/tariff_nomenclature.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_pdm/CategoryTemplateItem/portal_categories/variation.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml
index 545faf7b88..b0990183e3 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/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_pdm/CategoryTemplateItem/portal_categories/visual_pattern.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/visual_pattern.xml
index 990412ccba..fb3aecb585 100644
--- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/visual_pattern.xml
+++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/visual_pattern.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>
@@ -228,7 +225,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -236,7 +233,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees._OOBTree"/>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Individual%20Variation.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Individual%20Variation.xml
index 922c615207..43466f4de2 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Individual%20Variation.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Individual%20Variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Module.xml
index 66c67b7ae4..e3801b9f41 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,6 +74,10 @@ be a problem).</string> </value>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component.xml
index e2b696d3f8..4014ba0819 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Component.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Cell.xml
index d9fae5e389..287f914d20 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml
index 145e6c4b83..e72516789a 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -93,10 +90,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -113,10 +107,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Module.xml
index 6b401a2ea4..26e2caf52c 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -81,6 +78,10 @@ be a problem).</string> </value>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply.xml
index be74b7c76a..f9f4b33758 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure%20Cell.xml
index ae9004d2b0..427a003c74 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure.xml
index c0d0c372ad..5db4ff4511 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Measure.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Individual%20Variation.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Individual%20Variation.xml
index 6212aaf40b..e101724dac 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Individual%20Variation.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Individual%20Variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Module.xml
index 72d03a8f30..d001055a90 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product.xml
index 4f796be5fa..13a29c6794 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Product.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -82,10 +79,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -102,10 +96,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
index ed78d3809f..d8046147da 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
index 5dd6d2bd2b..a61ff43503 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
index 5df5ef061c..bfd4d1b128 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
index fa4d39a560..f7a3c5fc84 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Definition.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Definition.xml
index bd53c17729..b4711711a2 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Definition.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Definition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Group.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Group.xml
index e2ae6627f0..be9c620177 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Group.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Group.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -69,10 +66,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -89,10 +83,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Module.xml
index bbae193a4c..01e4ae97c5 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Quantity%20Unit%20Conversion%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -103,15 +100,16 @@
             <key> <string>product</string> </key>
             <value> <string>ERP5Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -128,10 +126,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
index 30dc243e3e..6e9e8883ad 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
index 24b8d9757d..fc0a93bc9c 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
index 4de1e8fb76..65aad65a4f 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -73,6 +70,10 @@ be a problem).</string> </value>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
index 51fc8ad921..af98a7c4c4 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Individual%20Variation.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Individual%20Variation.xml
index 199e522c2f..ac91899149 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Individual%20Variation.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Individual%20Variation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Module.xml
index 27e1698f4b..8db8088975 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service.xml
index 40084f6483..4368c3e0e2 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Service.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
index 3924a0b3c1..24484ea10a 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Line.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
index 223962a3c7..e306991483 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Module.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Module.xml
index 8767f144a1..f0ba8d3385 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Module.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Module.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -80,6 +77,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation%20Cell.xml
index d000195e48..9e290c8aac 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation.xml
index 93629ade18..95ed59e893 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Operation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,10 +85,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -108,10 +102,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Optional%20Resource.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Optional%20Resource.xml
index c8d4fbfb48..efd14a33a2 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Optional%20Resource.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Optional%20Resource.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,10 +85,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -108,10 +102,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource%20Cell.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource%20Cell.xml
index df66b38a21..8d4edbba62 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource%20Cell.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource%20Cell.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource.xml
index 85ff080f87..130b89e578 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation%20Transformed%20Resource.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,10 +85,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -108,10 +102,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation.xml b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation.xml
index 123166b45f..6663479c31 100644
--- a/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation.xml
+++ b/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Transformation.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +87,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -110,10 +104,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Amount_hashVariationCategoryItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Amount_hashVariationCategoryItemList.xml
index 62c242efb6..7335d942f3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Amount_hashVariationCategoryItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Amount_hashVariationCategoryItemList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/AssortedResource_asCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/AssortedResource_asCellRange.xml
index fffc8faab9..e30fa686c6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/AssortedResource_asCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/AssortedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_getVariationCategoryTranslatedTitleString.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_getVariationCategoryTranslatedTitleString.xml
index 47436e74b9..308b06c3f6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_getVariationCategoryTranslatedTitleString.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_getVariationCategoryTranslatedTitleString.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_validateEan13Code.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_validateEan13Code.xml
index 3a9323aeea..84767c18b1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_validateEan13Code.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_validateEan13Code.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList.xml
index 6de523483d..c7d6664b54 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList/listbox.xml
index 074e8eeef7..16451f24c2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view.xml
index e379916060..52f8a6232d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox.xml
index 680c6cd8d2..418ab7d409 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox_variation_base_category.xml
index 4e8284b590..30e6f3d90b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/listbox_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_aggregated_portal_type_list.xml
index ab383c4a7f..1fffc9dbd3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_aggregated_portal_type_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_contribution_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_contribution_list.xml
index eb2fbd82f2..cf593d0bbe 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_contribution_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_contribution_list.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>
@@ -262,10 +259,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>
@@ -278,10 +272,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_height.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_height.xml
index 569ec13404..4018480be1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_height.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_height.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_length.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_length.xml
index 0ef602b54d..d617702a06 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_length.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_length.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_volume.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_volume.xml
index 4f560f04ad..045f3d0525 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_volume.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_volume.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_weight.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_weight.xml
index d99110b44a..5cc3cfb0f8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_weight.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_weight.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_width.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_width.xml
index 5f544c2fbc..aa28d57c57 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_width.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_base_width.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_comment.xml
index af4ce457f0..08f80fc81d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_absolute_url.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_absolute_url.xml
index 0544771db5..438b4a09f0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_absolute_url.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_absolute_url.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_file.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_file.xml
index c3d98bfb26..53b1fd892e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_file.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_default_image_file.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_description.xml
index 3fbcf632c6..5cf7fc3a44 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_ean13_code.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_ean13_code.xml
index c304f9f0c1..04cac7d1ad 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_ean13_code.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_ean13_code.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_individual_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_individual_variation_base_category.xml
index 0edba0ef63..4e94c6847b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_individual_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_individual_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_optional_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_optional_variation_base_category_list.xml
index 3dc27eec55..c0a1ab8ea1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_optional_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_optional_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_product_line.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_product_line.xml
index c4db6a7662..660149d1c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_product_line.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_product_line.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_quantity_unit_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_quantity_unit_list.xml
index 2f2e39d098..384cb1e04c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_quantity_unit_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_quantity_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_reference.xml
index 4b07d19678..6d911f9c62 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_required_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_required_aggregated_portal_type_list.xml
index e937e604a9..4a96f1625a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_required_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_required_aggregated_portal_type_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_title.xml
index edff61975f..01721c3ba5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_translated_validation_state_title.xml
index 9e2b25e2e9..c48ed11615 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_use_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_use_list.xml
index 9f5a360c19..f734983e96 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_use_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_use_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>
@@ -284,10 +281,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_base_category_list.xml
index 4bc0d4162f..8dd3b0e80b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_category_list.xml
index a3b0283d5a..3d1a352324 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_view/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Component_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>
@@ -288,10 +285,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>
@@ -304,10 +298,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>
@@ -320,10 +311,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_asCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_asCellRange.xml
index 8d87e62bd7..c6f4fec2d0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_asCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_print.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_print.xml
index 0db4a78615..06d1c9e918 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_print.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_printPdfTemplate.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_printPdfTemplate.xml
index d8e9264fde..12e4896dfc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_printPdfTemplate.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_printPdfTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <?xml version="1.0" encoding="utf-8" ?>\n
 <template filename="default.pdf"\n
@@ -136,7 +133,7 @@
 \n
 </template>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -150,9 +147,13 @@
             <key> <string>id</string> </key>
             <value> <string>Consumption_printPdfTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view.xml
index 1e0815d707..83160dd1ed 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_description.xml
index b136901c67..c6eade7285 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_title.xml
index d77d163b2b..5a0461c1f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_base_category.xml
index 42a812ad3c..dbe16ff51c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_base_category.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_category_list.xml
index 86c1ba9579..453099f732 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_view/my_variation_category_list.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity.xml
index dcabbd125e..55abd6eadd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/mapped_value_property_list.xml
index a589af11e0..a9d7cd9aa2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox.xml
index 937547bf12..71b2eed0f9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_membership_criterion_category_list.xml
index 3a463f4872..66db956334 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_quantity.xml
index 567e0fca1e..82fe7f2cab 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/matrixbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/my_title.xml
index 0eb3ac8dbd..3b1f209998 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Consumption_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList.xml
index 0f66bc2b77..c280a90bfe 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList/listbox.xml
index bb27bf065a..d90526ad16 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewPurchaseResourceList/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>
@@ -370,10 +367,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>
@@ -386,10 +380,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList.xml
index 5c4edac6ef..369715e100 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList/listbox.xml
index 66a0bc7569..31d82dbab6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ERP5Site_viewSaleResourceList/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>
@@ -370,10 +367,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>
@@ -386,10 +380,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge.xml
index 0b951faf18..e1dd4e3547 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge/Image_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge/Image_view.xml
index a25a35f6d6..2b2a688703 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge/Image_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Image_viewLarge/Image_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ImageField" module="Products.ERP5Form.ImageField"/>
-        <tuple/>
-      </tuple>
+      <global name="ImageField" module="Products.ERP5Form.ImageField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_init.xml
index 9b0bd1cea7..ec76fdd26b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view.xml
index 163e4e6a3e..c2d9949b06 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_title.xml
index edff61975f..01721c3ba5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_variation_base_category.xml
index d81b1bf421..8a19dec22d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_view/my_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/IndividualVariation_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml
index 98ae0a8271..8fa73998cd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewAdditionalPrice.xml
index ed47078d70..f6ab7193bd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewBasePrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewBasePrice.xml
index 01ce299937..1adb452fa9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewBasePrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewDiscountRatio.xml
index e91702ec81..4a7576ef2e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewExclusiveDiscountRatio.xml
index 9eacbf87f6..a31ce76aa6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewExclusiveDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxDelay.xml
index d1d42c5426..f8b8fc9368 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxFlow.xml
index 748e8b4369..4ed65df09f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxStock.xml
index 6d462a39a8..e7ea892cd6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMaxStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinDelay.xml
index f428faafb8..0579429a61 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinFlow.xml
index 76e8c6604a..0c65a64fe9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinStock.xml
index 61ff52ad94..d886b50cf7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewMinStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewNonDiscountableAdditionalPrice.xml
index 53c80092bf..29a146a223 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewNonDiscountableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewSurchargeRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewSurchargeRatio.xml
index 919b5bd6b4..51c259e227 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewSurchargeRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewVariableAdditionalPrice.xml
index a718e484b1..cc56353226 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_viewVariableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList.xml
index 9e930a6443..7f897be033 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList/listbox.xml
index 460dae7a28..3696e716ef 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyModule_viewInternalSupplyList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view.xml
index 33d05ba7ea..47ca5b68ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/listbox.xml
index cc6eefda29..8b29fdd22e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_comment.xml
index 1b4cba9d48..eafaf23faf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_description.xml
index b740a0bf5d..b3452b35ce 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_decision_title.xml
index 1e599404a6..14d730454b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_section_title.xml
index b84edd187a..1e942bc08f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_title.xml
index 5a21d7ebe8..79b782c82e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_decision_title.xml
index 4ccf11d3cc..a07e8cb746 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_section_title.xml
index ccd0628dbd..15d1a68d3b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_title.xml
index 49b4860c06..38840724ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_title.xml
index 7a011cf62f..3341889cbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_translated_validation_state_title.xml
index 33ce82496c..4110ecd2c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view.xml
index 2cd5025dec..1b373bcd18 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox.xml
index e1ddffa6b7..3508414d6b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/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>
@@ -318,10 +315,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>
@@ -334,10 +328,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>
@@ -350,10 +341,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>
@@ -366,10 +354,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_predicate_category_list.xml
index 5061a17bd2..7cfa4bc696 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_quantity.xml
index fc08b7b92f..ddbfc45ad4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_default_metric_type.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_default_metric_type.xml
index 2a6e756cef..a8c05c8df2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_default_metric_type.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_default_metric_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_measure_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_measure_variation_base_category_list.xml
index c26a42b898..224aba29d0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_measure_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_measure_variation_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>
@@ -124,10 +121,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_metric_type.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_metric_type.xml
index d1e21663e5..82419fe2b8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_metric_type.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_metric_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity.xml
index 8966111b00..501095b672 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity_unit.xml
index 9d6240270b..a8a220a403 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/my_quantity_unit.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>
@@ -126,10 +123,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>
@@ -142,10 +136,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml
index b95aedace6..da1e9b2353 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view.xml
index 92c4acfe6e..7e3a6e7b9f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_additional_price.xml
index 753a9111ff..bee3f23d34 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_price.xml
index 5c5322c693..34af35387d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_unit_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_unit_price.xml
index 08fa5fde1e..9ccf031933 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_unit_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_base_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_comment.xml
index da5bc7a81e..aa4eb7f9a4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_discount_ratio.xml
index 0388f74768..5b67bcdb24 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml
index f62f7c22d9..aae0e06f69 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_delay.xml
index 91d58d4a60..1d7e0c2af0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_flow.xml
index eb35a78020..66c937ab25 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_stock.xml
index 188e9c29ef..b78162b7b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_delay.xml
index f00c4d59b2..c4d7c4c967 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_flow.xml
index 1c4230105d..2ea9c59951 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_stock.xml
index 0f78392bf4..5b46974d9d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml
index 23a919151a..14321d9015 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_non_discountable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_source_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_source_reference.xml
index 9934036545..7b75b7b7c2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_source_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_source_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_surcharge_ratio.xml
index 9dd45847a5..566a7f1eb2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_variable_additional_price.xml
index 6e57bcd9c8..c761e457e1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_view/my_variable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice.xml
index ebaf9ab646..db446ec479 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
index 4fb5965130..74c209f7ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox.xml
index 92de960ffb..2ccf32d398 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
index 18b7d373fb..673509b7c1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_additional_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price.xml
index 753a9111ff..bee3f23d34 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
index c93a9c2fbf..afdb0d567e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice.xml
index 36ad209ebd..dfca1f717c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox.xml
index 35f19f6168..4f44b18dbc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_base_price.xml
index 5205597086..11368d877b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_base_price.xml
index 5c5322c693..34af35387d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 97989766ff..64cb17e62b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_step_list.xml
index 20052c38e2..78123460ae 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio.xml
index b615783a1d..da2c26a3bc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/mapped_value_property_list.xml
index 4d46806251..26aac2dce3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox.xml
index 90ada6a8ae..7cc4a284e2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1.xml
index f5cddae113..fb1685e488 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
index 50bda57957..f7345332a9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
index 174f37f16d..e956a2f6b7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio.xml
index 0388f74768..5b67bcdb24 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
index b9f9365608..2f0678dae9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
index da816abb31..f51cf51788 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio.xml
index 0006ce2911..2f33270900 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
index efa1cabef4..3d686485dc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
index 93d20b74ab..962059516d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
index 19f03fda88..13761aaa99 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
index fe94a777c3..3aceb9e26e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
index ded261a641..bbcd36b1c7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
index f62f7c22d9..aae0e06f69 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
index 77ea00a119..f308d4210f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
index 79d908501c..db153a8556 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay.xml
index d2d31d6391..f0678e1cb1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox.xml
index 0713510c8d..47680b149c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_max_delay.xml
index e4bcad291f..26d32eb526 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_max_delay.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_max_delay.xml
index 91d58d4a60..1d7e0c2af0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml
index 6824041a92..8a8245fa26 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow.xml
index 0f474cabd9..ff4185388a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox.xml
index 30431d87a2..850daf331b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_max_flow.xml
index a94c11936f..45e109bb12 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_max_flow.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_max_flow.xml
index eb35a78020..66c937ab25 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml
index fc836e72b1..f4ee828d43 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock.xml
index d6099c77c7..9554fbcb75 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox.xml
index 003908e1b7..ecf6e7b20a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_max_stock.xml
index d8d5591a30..54734cf0d4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_max_stock.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_max_stock.xml
index 188e9c29ef..b78162b7b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml
index a51839b3d1..73c4915f22 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay.xml
index 2564213d27..2c60d459f3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox.xml
index 123687e8a3..c1b7b94177 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_min_delay.xml
index d8c121510d..45c125ccd1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_min_delay.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_min_delay.xml
index f00c4d59b2..c4d7c4c967 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml
index 0858be73cb..3720eb248f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow.xml
index 74aca3748a..237630ea53 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox.xml
index a146ba6d82..9aa37bb7ef 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_min_flow.xml
index 6d4c6f8d51..cd5a6be46a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_min_flow.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_min_flow.xml
index 1c4230105d..2ea9c59951 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml
index 9cfaed8f27..a72fe4bef7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock.xml
index 55bec2c182..25b51771fb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox.xml
index 9f12614f61..5097ec157b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_min_stock.xml
index 552a7edf9d..d4277a25bf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_min_stock.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_min_stock.xml
index 0f78392bf4..5b46974d9d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_p_variation_base_category_list.xml
index 2fc5c904df..867651937e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice.xml
index 079153cdae..88c29aecf3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
index 5353486a72..bc92027b68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
index 5c69367091..304ad40fe2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
index 6fd51e0373..ca3b41bd3a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
index 23a919151a..14321d9015 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
index 7461c5052a..167b18cdbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio.xml
index ec28694d21..3ac590d622 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
index 5103abab9c..05c40e95ae 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox.xml
index 6565efaad5..01016002af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1.xml
index 0bf5046103..bae3b0b880 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
index e09d184814..ac6fb393c8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
index b644bacf96..3792b67d90 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
index 9dd45847a5..566a7f1eb2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
index 18b0c7ecc6..3d6e41d85e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
index 0d5a11237f..67d5acf958 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice.xml
index e373b4963c..1ec77bd173 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
index 113ef17e4a..d9b84890ee 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox.xml
index bddfae08ae..3cf0f2dcb4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
index 25e1892363..461eaa16a7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
index 6e57bcd9c8..c761e457e1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
index 2d70aeb351..02d046e3f7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList.xml
index 0a407021fd..98ba33594f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList/listbox.xml
index c15fe5a009..2b6b17d96b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyModule_viewPurchaseSupplyList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view.xml
index 3477d5e9a0..bfe7aba10d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/listbox.xml
index 00d11b4ff7..adff736d3d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_comment.xml
index 1b4cba9d48..eafaf23faf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_description.xml
index b740a0bf5d..b3452b35ce 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_decision_title.xml
index 1e599404a6..14d730454b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_section_title.xml
index b84edd187a..1e942bc08f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_title.xml
index 5a21d7ebe8..79b782c82e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_decision_title.xml
index 4ccf11d3cc..a07e8cb746 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_section_title.xml
index ccd0628dbd..15d1a68d3b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_title.xml
index 49b4860c06..38840724ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_title.xml
index 7a011cf62f..3341889cbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_translated_validation_state_title.xml
index 33ce82496c..4110ecd2c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary.xml
index 61b6ae5ed7..9866ecf940 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary/listbox.xml
index ce6d68f6ce..174b5c60c8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile.xml
index f7e11df4ef..121b8b4b29 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_administration_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_administration_title.xml
index 22a309f1ba..7422618009 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_administration_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_administration_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_carrier_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_carrier_title.xml
index e0ea500b55..88783ececb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_carrier_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_carrier_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_decision_title.xml
index 1e599404a6..14d730454b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_payment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_payment.xml
index 68147412eb..279e06d0a9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_payment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_payment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_project_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_project_title.xml
index f004bd2f34..d7fea55189 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_project_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_project_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_reference.xml
index 7048d88a5b..8131a979a1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_section_title.xml
index b84edd187a..1e942bc08f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_title.xml
index 5a21d7ebe8..79b782c82e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_administration_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_administration_title.xml
index 47faefeb8f..41e743330b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_administration_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_carrier_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_carrier_title.xml
index 97f9fec34e..54de3490f2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_carrier_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_carrier_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_decision_title.xml
index 4ccf11d3cc..a07e8cb746 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_payment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_payment.xml
index c1de371c1f..2785fe09b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_payment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_payment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_project_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_project_title.xml
index 22ffa4d4a4..50aff9a550 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_project_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_project_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_reference.xml
index 8b98f1a35f..24070dddd9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_section_title.xml
index ccd0628dbd..15d1a68d3b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_title.xml
index 49b4860c06..38840724ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupply_viewProfile/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml
index 8e4c2371c2..9af3d7d4b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml
index e67208b599..197b00542c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml
index 4be2f2be1a..d913b07439 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity_unit.xml
index 840fe44bff..c788bbbd94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity_unit.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>
@@ -120,10 +117,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/standard_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/standard_quantity_unit.xml
index 825e0af0e5..d5ee5f2218 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/standard_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/standard_quantity_unit.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>
@@ -131,10 +128,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view.xml
index b381aa4831..55d83cd3a2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox.xml
index a9a06cb8e1..c4f33a7cd9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox_quantity_unit.xml
index c89ea0224e..32bf6405be 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/my_quantity_unit.xml
index ed719ad6e3..a92d875161 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionGroup_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml
index b739e03cfe..e2b3098cd0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_invalidateUniversalDefinitionDict.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_invalidateUniversalDefinitionDict.xml
index d256503563..dc01d8cbc2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_invalidateUniversalDefinitionDict.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_invalidateUniversalDefinitionDict.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList.xml
index 5ba587a35a..70ffd79741 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox.xml
index 1ebfd4e8bc..cee29ff252 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox_quantity_unit.xml
index c89ea0224e..32bf6405be 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_viewQuantityUnitConversionGroupList/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversion_getQuantityUnitList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversion_getQuantityUnitList.xml
index 4c2b1e8128..2e22856a19 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversion_getQuantityUnitList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversion_getQuantityUnitList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml
index 62851be75c..5f874b404f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml
index ce7120218e..c4da1102c9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getConvertedInventoryStat.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.xml
index 886f5e4e2e..c3cac12294 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_getSelection.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml
index 5cdef2e6b2..4e5b6b84a2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml
index c94a81b09e..39a6e89eb0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/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>
@@ -198,10 +195,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>
@@ -214,10 +208,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>
@@ -230,10 +221,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml
index 9203c26b88..4dca20b6f6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_type.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_metric_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml
index bd1224c34d..7d9913dabd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewConvertedInventoryReportDialog/your_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog.xml
index 15d06a4b8f..4fed0f0a66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml
index a1a6deb8e1..b29bf2a535 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_viewTransformedResourceInventoryDialog/your_transformed_resource_list.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>
@@ -261,10 +258,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
index 3535180c90..a322a21161 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
index 65525dcff8..ed32358a2a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultInternalSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultInternalSupplyLine.xml
index c55016c5c5..70169dec80 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultInternalSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultInternalSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultPurchaseSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultPurchaseSupplyLine.xml
index 43531271c3..c2063a80f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultPurchaseSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultPurchaseSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSaleSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSaleSupplyLine.xml
index e1dc961a76..e6aad4f990 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSaleSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSaleSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSupplyLine.xml
index 9b80be6b27..423871a684 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getDefaultSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.xml
index 2346867ce8..66d94ffc5c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementHistoryStat.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementHistoryStat.xml
index 6488753d82..cbae541d76 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementHistoryStat.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementHistoryStat.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementedSectionItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementedSectionItemList.xml
index 47fa6c6b99..07d7fabedc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementedSectionItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getMovementedSectionItemList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.xml
index 764fbebbcd..573f210475 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPrice.xml
index 20ce7bd3d6..3841f67f13 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml
index 2d4c376615..aa838003a4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getPriceCalculationOperandDict.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getScaledInventoryList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getScaledInventoryList.xml
index 66c74ad85e..90bdf8aafb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getScaledInventoryList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getScaledInventoryList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml
index da759aad3d..fb11d4d01a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getTransformedResourceInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariatedInventoryList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariatedInventoryList.xml
index ed646d2d23..81b8d6c7a0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariatedInventoryList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariatedInventoryList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.xml
index dcbdb4d958..5d6ec82fec 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml
index 86eb138e31..84aee54bc1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_statInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_statInventory.xml
index a95fe4842b..771c431278 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_statInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_statInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine.xml
index 0fd721698e..f39e921b4a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/mapped_value_property_list.xml
index 48161c580f..4ea8b3a219 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox.xml
index 9b5c4de5bf..4ff58161e7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_base_price.xml
index c7519be943..38db96464c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_predicate_category_list.xml
index 08acf67058..8cc91774af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_variation_category_list.xml
index 144272436d..87d8d32214 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_price.xml
index 6fb73aa676..7be13d3b23 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_unit_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_unit_price.xml
index 64bc7a1790..fbf882b1f7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_unit_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_base_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_comment.xml
index c441822226..de36e329bc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_reference.xml
index 1cbd802d1f..77dc997a91 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_title.xml
index fd23555df5..3fe3a5ab06 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_delay.xml
index 51e3b3b1ed..22b1ec0156 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_flow.xml
index 24dd890347..785c213202 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_stock.xml
index 1c8fb18f18..e66317c7f5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_delay.xml
index e289a3f13d..4153f9b69b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_flow.xml
index 7455f5fc99..e2c1a11a56 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_stock.xml
index fcdfe76397..9501687779 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_p_variation_base_category_list.xml
index 3b910d9d3c..d532bb2057 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_p_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_price_currency.xml
index 7dbad5a8f3..ae6e1bd54c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_priced_quantity.xml
index bde7f200ee..bb6ecb91f7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_quantity_step_list.xml
index f2446b94bd..8075a45473 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_source_account.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_source_account.xml
index 0e1bb729e0..8fc91494bc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_source_account.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_source_account.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_max.xml
index da6f3faac8..7d609b8fa9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_min.xml
index 57993dd852..238f5ad02a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultInternalSupplyLine/my_internal_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine.xml
index 853dbfab96..7dcb506762 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/mapped_value_property_list.xml
index 48161c580f..4ea8b3a219 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox.xml
index 490ab2a003..c798e13e54 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_base_price.xml
index bde7797c6d..749b113306 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_predicate_category_list.xml
index 08acf67058..8cc91774af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_variation_category_list.xml
index 144272436d..87d8d32214 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_price.xml
index bd19d0e5ff..e3147d3a8a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_unit_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_unit_price.xml
index 57a55c7f34..cf02e5620d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_unit_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_base_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_comment.xml
index ec8353784a..057811a209 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_destination_account.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_destination_account.xml
index b617c91edf..b133d02745 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_destination_account.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_destination_account.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_delay.xml
index eb1f144fb6..05722848bd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_flow.xml
index a534df0e35..559a41ef54 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_stock.xml
index 88de574aa9..b79d9918eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_delay.xml
index 2825f75fdb..f06d9825ef 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_flow.xml
index cb277826ef..15b65afb6b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_stock.xml
index 75ecc471ec..ed93d577f9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml
index 23f0255c41..7ec82337af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_price_currency.xml
index 9ade9962aa..9f10ac10bf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_priced_quantity.xml
index acac6d2b59..1456a1187d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_quantity_step_list.xml
index fbbb258388..7f74f23d67 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_reference.xml
index 96f3692ba0..7bb60d3d78 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_title.xml
index e74d75cc88..5197434eac 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_max.xml
index 0de3924cca..5bc1874c18 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_min.xml
index 09e54a19ea..71d55d6481 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine.xml
index 1cdf7cf86f..3d83219a95 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/mapped_value_property_list.xml
index 48161c580f..4ea8b3a219 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox.xml
index cbd1c03980..e25ac5dac9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_base_price.xml
index bdb5a88784..df76c309de 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_predicate_category_list.xml
index 08acf67058..8cc91774af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_variation_category_list.xml
index 144272436d..87d8d32214 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_price.xml
index bca25cbb91..2b2c3b6871 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_unit_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_unit_price.xml
index 66d9848a84..d20ed9e284 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_unit_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_base_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_comment.xml
index 7af327e5fe..8bea4a1084 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_reference.xml
index f4217f6aa2..89de9f309a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_title.xml
index 5035adcf82..4523b804ea 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_delay.xml
index dcfc15add0..2471527581 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_flow.xml
index e990bac7fa..048e9195c0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_stock.xml
index feec83f64c..52b4da7194 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_delay.xml
index 3dd4b503b2..22b0a7f0ed 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_flow.xml
index bfabc7331c..d4ecc7303b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_stock.xml
index 019097df97..94adc88e38 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml
index eb83f6a5cb..062a1a9a28 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_price_currency.xml
index 49955d796b..e7324d5182 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_priced_quantity.xml
index e7a6a3eb23..75cbcecaac 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_quantity_step_list.xml
index 13591632ce..0c54ce20d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_source_account.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_source_account.xml
index 5e26ddadc4..ace8dc63dc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_source_account.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_source_account.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_max.xml
index f71c6bb795..0828e37d38 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_min.xml
index 19ea2544f1..e72d610d6c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference.xml
index 8bfaca33a7..d4528dfe13 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/mapped_value_property_list.xml
index 2953203cde..30e05fa20f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox.xml
index 6ce488d108..787af03852 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/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>
@@ -337,10 +334,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>
@@ -353,10 +347,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>
@@ -369,10 +360,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_reference.xml
index 3000856da9..9bd035680e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_comment.xml
index 184fadea85..e9ecb73072 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_supply_line_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_supply_line_start_date_range_max.xml
index c336b740d2..b4fd80dc80 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_supply_line_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSupplyLineReference/my_supply_line_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary.xml
index 34e728d926..2053993d2b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary/your_quantity_unit_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary/your_quantity_unit_list.xml
index 702671cc41..aea5442774 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary/your_quantity_unit_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDialogFieldLibrary/your_quantity_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_aggregated_portal_type_list.xml
index feee641d84..7f41a628aa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_aggregated_portal_type_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>
@@ -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>
@@ -143,10 +137,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_height.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_height.xml
index 249b760de3..7b5b2ab647 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_height.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_height.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_length.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_length.xml
index 3f5d566279..11543c24b2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_length.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_length.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_volume.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_volume.xml
index 856374a141..7238f8752e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_volume.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_volume.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_weight.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_weight.xml
index fe5bf13e3c..9ebb1ffb8b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_weight.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_weight.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_width.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_width.xml
index bfa4fcd315..6d2c07a8d5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_width.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_base_width.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_comment.xml
index 1eab08eeec..e4348ff5a1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_individual_variation_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_individual_variation_listbox.xml
index 177832330c..fe9f4b1e90 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_individual_variation_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_individual_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_module_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_module_listbox.xml
index b7d38c2cde..5172d02670 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_module_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_component_module_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_description.xml
index d4af731703..e34818c4ac 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_ean13_code.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_ean13_code.xml
index bcf1b9e1d3..6cba070af7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_ean13_code.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_ean13_code.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>
@@ -117,10 +114,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_individual_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_individual_variation_base_category.xml
index e4f8989acc..079c54a7d0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_individual_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_individual_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>
@@ -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>
@@ -146,10 +140,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_optional_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_optional_variation_base_category_list.xml
index cfc558412b..1424f5d23e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_optional_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_optional_variation_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>
@@ -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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_portal_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_portal_variation_base_category_list.xml
index d1505cca3a..38c9b8a500 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_portal_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_portal_variation_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>
@@ -133,10 +130,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_individual_variation_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_individual_variation_listbox.xml
index 296e868cda..9e281bb5c6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_individual_variation_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_individual_variation_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>
@@ -201,10 +198,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_line.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_line.xml
index ae877b4a0a..b21960c2f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_line.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_line.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_module_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_module_listbox.xml
index c665b3db8a..bb1c9832fb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_module_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_module_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_quantity_unit_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_quantity_unit_list.xml
index 86c18feaf1..7303ee913f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_quantity_unit_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_quantity_unit_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_reference.xml
index 294212529a..63f35ba89e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_required_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_required_aggregated_portal_type_list.xml
index b0875ba35b..f078da9907 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_required_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_required_aggregated_portal_type_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>
@@ -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>
@@ -143,10 +137,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_individual_variation_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_individual_variation_listbox.xml
index 82b7332063..67078173b2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_individual_variation_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_individual_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_module_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_module_listbox.xml
index 4ff027480a..e245f12410 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_module_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_module_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_title.xml
index 71cdb39da6..7de5099b88 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_base_category_list.xml
index 22dcc48fa0..626eb0bc53 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_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>
@@ -148,10 +145,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>
@@ -164,10 +158,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>
@@ -180,10 +171,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_category_list.xml
index 62fe373023..78d8766310 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_variation_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>
@@ -146,10 +143,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>
@@ -162,10 +156,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>
@@ -178,10 +169,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions.xml
index d8d4c54e88..90f4aa4f1b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions/my_instructions.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions/my_instructions.xml
index ff0dbb2210..549ba62a39 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions/my_instructions.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInstructions/my_instructions.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory.xml
index b10d23458f..d3a2dc1fc2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox.xml
index 811057490c..dfe9d47312 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -555,10 +552,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>
@@ -571,10 +565,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>
@@ -587,10 +578,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getAvailableInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getAvailableInventory.xml
index b712a3ef41..4e30478732 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getAvailableInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getAvailableInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getCurrentInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getCurrentInventory.xml
index fd33083ddf..1ab5c14f98 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getCurrentInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_getCurrentInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_inventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_inventory.xml
index d7795d970e..e235ebcf94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_inventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_inventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_variation_category_item_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_variation_category_item_list.xml
index 3bc300c8db..55b6511fc9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_variation_category_item_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/listbox_variation_category_item_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/my_title.xml
index 1a05152a22..64528ede64 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventory/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart.xml
index 010cbb6744..0b20476111 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_at_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_at_date.xml
index ffe6d9a53f..7e20c39775 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_at_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_chart.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_chart.xml
index e354b974d8..17e901ea1a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_chart.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_chart.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_from_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_from_date.xml
index 02b0229aa9..1916531221 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_from_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_listbox.xml
index 28412fd652..aac8d91549 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_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>
@@ -134,10 +131,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_node.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_node.xml
index bebe75f60a..a513d639b0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_node.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_node.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>
@@ -117,10 +114,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>
@@ -133,10 +127,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_variation_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_variation_list.xml
index ed107fa88e..282a36d6f9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_variation_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChart/your_variation_list.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog.xml
index d8644c8a83..6246426625 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_at_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_at_date.xml
index 78a51989ec..659e457f37 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_at_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_format.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_format.xml
index fcd61518c5..263db24aff 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_format.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_from_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_from_date.xml
index 5772515f68..af6dc69148 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_from_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_node.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_node.xml
index 59d27e84d6..960b16c3e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_node.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_node.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>
@@ -124,10 +121,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_portal_skin.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_portal_skin.xml
index fcfa8e62f9..46dea8f260 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_portal_skin.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_portal_skin.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_variation_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_variation_list.xml
index 86d30d3ed6..275c3edef5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_variation_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryChartDialog/your_variation_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>
@@ -284,10 +281,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart.xml
index 019ffdb2a8..5800bcde2a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_at_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_at_date.xml
index ffe6d9a53f..7e20c39775 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_at_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_chart.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_chart.xml
index b09e8b0f31..7613e3ed2c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_chart.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_chart.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_listbox.xml
index 0bf331dd54..53279fead1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_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>
@@ -134,10 +131,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_node.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_node.xml
index bebe75f60a..a513d639b0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_node.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChart/your_node.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>
@@ -117,10 +114,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>
@@ -133,10 +127,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog.xml
index 0b51c166b5..f8f69fcd3c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_at_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_at_date.xml
index 96711339c4..28a6b7145f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_at_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_format.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_format.xml
index fcd61518c5..263db24aff 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_format.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_node.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_node.xml
index 59d27e84d6..960b16c3e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_node.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_node.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>
@@ -124,10 +121,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_portal_skin.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_portal_skin.xml
index fcfa8e62f9..46dea8f260 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_portal_skin.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewInventoryVariationChartDialog/your_portal_skin.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure.xml
index d68b5aadfb..148745c44b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox.xml
index aafa765730..0ffd456fc2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_default_metric_type.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_default_metric_type.xml
index d54c8fce6e..9857e88c2f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_default_metric_type.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_default_metric_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity.xml
index 2fa6893381..efcae9542c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity_unit.xml
index 0b83132e89..2e4a070db4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/listbox_quantity_unit.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>
@@ -117,10 +114,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>
@@ -133,10 +127,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/my_quantity_unit_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/my_quantity_unit_list.xml
index e2e249e077..0b32e18492 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/my_quantity_unit_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMeasure/my_quantity_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory.xml
index 13292d9c4e..f6435e6c6f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
index f7b52bd482..5c8e8608e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -522,10 +519,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -538,10 +532,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_date.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_date.xml
index 3642e14f96..e50520c932 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_date.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_total_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_total_quantity.xml
index 60e594d144..3825067e95 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_total_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_total_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_variation_category_item_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_variation_category_item_list.xml
index 3bc300c8db..55b6511fc9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_variation_category_item_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox_variation_category_item_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup.xml
index 637ba68ea3..fbc20900b6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox.xml
index f1fe27b1b5..34ee6cfe0d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox_quantity_unit.xml
index 1be351b147..705d6a9fc6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewQuantityUnitConversionGroup/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList.xml
index 746c5eb8f0..fd0c8504fa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList/listbox.xml
index f2dc2f2326..1e5834e6ed 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewRelatedSupplyLineList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -573,10 +570,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory.xml
index cb698d4b86..962d38b184 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
index 4c0253d2fa..a6515807f9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -581,10 +578,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>
@@ -597,10 +591,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_inventory.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_inventory.xml
index d7795d970e..e235ebcf94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_inventory.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_inventory.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_transformed_variation_text.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_transformed_variation_text.xml
index b443a28160..552e93c898 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_transformed_variation_text.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_transformed_variation_text.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_variation_text.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_variation_text.xml
index 862b0c303a..35907d97d2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_variation_text.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventory/listbox_variation_text.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog.xml
index fdeb3b7902..0cb8c98d41 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml
index 632a5f91d1..766e321b02 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog/your_transformed_resource_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewTransformedResourceInventoryDialog/your_transformed_resource_list.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>
@@ -261,10 +258,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
index de87b4cf56..b0c593aebe 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
index acb9591cc4..e9f107074b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-        <tuple/>
-      </tuple>
+      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml
index 3d3549edcf..5034e1bc0a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view.xml
index c9959cd00a..26c3ee2e88 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_additional_price.xml
index e40bf0f64e..fad731b5fb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_price.xml
index e4f9a656d3..14a16ddf0b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_unit_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_unit_price.xml
index 08fa5fde1e..9ccf031933 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_unit_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_base_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_comment.xml
index 1b4cba9d48..eafaf23faf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_destination_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_destination_reference.xml
index 119e34f170..259f707722 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_destination_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_destination_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_discount_ratio.xml
index c88f35a1e0..61cdb9e74e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_exclusive_discount_ratio.xml
index 6e0539b95e..003ce2a4a5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_non_discountable_additional_price.xml
index 9ef1c2d657..6d0c4b012d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_non_discountable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_priced_quantity.xml
index a780fb828a..574deab9f8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_resource_title.xml
index 8375cc1549..cbf49e1fba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_surcharge_ratio.xml
index cf830762c2..93dee42d9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_variable_additional_price.xml
index c9f84aa06d..8e52af26ca 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_view/my_variable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice.xml
index 3aae636b16..3670f09b8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
index 4fb5965130..74c209f7ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox.xml
index b22a4ab0f3..97a1928c19 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
index 18b7d373fb..673509b7c1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_additional_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml
index 753a9111ff..bee3f23d34 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
index c93a9c2fbf..afdb0d567e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice.xml
index 2418c8ba60..fa179d1021 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox.xml
index 8262e3708e..3fc560cb1f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_base_price.xml
index 5205597086..11368d877b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_base_price.xml
index 5c5322c693..34af35387d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 97989766ff..64cb17e62b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_step_list.xml
index 868bf25756..66830bcdb8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio.xml
index 5350b8c2de..0b58424ef3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/mapped_value_property_list.xml
index 4d46806251..26aac2dce3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox.xml
index 428097b481..4edb9f93eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1.xml
index c74dcca74e..3d284b6824 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
index 50bda57957..f7345332a9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
index 174f37f16d..e956a2f6b7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml
index 0388f74768..5b67bcdb24 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
index d6bf438718..95b19618ff 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_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>
@@ -323,10 +320,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
index b882d8509a..085ce838d1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio.xml
index bb57b32d0b..5f77d01fb0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
index efa1cabef4..3d686485dc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
index 1b1c5092ef..e62181ce47 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
index 4e176ff6e7..ae8187fdab 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
index fe94a777c3..3aceb9e26e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
index ded261a641..bbcd36b1c7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
index f62f7c22d9..aae0e06f69 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
index 77ea00a119..f308d4210f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
index 79d908501c..db153a8556 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay.xml
index ed9adf307d..0a38b79126 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox.xml
index 115afefc66..57428a0ec2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_max_delay.xml
index e4bcad291f..26d32eb526 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_max_delay.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_max_delay.xml
index 91d58d4a60..1d7e0c2af0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml
index 6824041a92..8a8245fa26 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow.xml
index 00435e5186..3e9835d1e7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox.xml
index 1facbabdd4..a1a391178a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_max_flow.xml
index a94c11936f..45e109bb12 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_max_flow.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_max_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_max_flow.xml
index eb35a78020..66c937ab25 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_max_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_max_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml
index fc836e72b1..f4ee828d43 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock.xml
index 10687f46e8..61f511bb53 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox.xml
index aa36e20da9..e3b2f43e1e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_max_stock.xml
index d8d5591a30..54734cf0d4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_max_stock.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_max_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_max_stock.xml
index 188e9c29ef..b78162b7b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_max_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_max_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml
index a51839b3d1..73c4915f22 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMaxStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay.xml
index 88d0649f77..e9eae6c1aa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox.xml
index 8c67b003f6..a0b1b95c30 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_min_delay.xml
index d8c121510d..45c125ccd1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_min_delay.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_min_delay.xml
index f00c4d59b2..c4d7c4c967 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml
index 0858be73cb..3720eb248f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinDelay/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow.xml
index 3c66227527..64ce827fb0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox.xml
index a8e15ac2ff..eb8f440f4a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_min_flow.xml
index 6d4c6f8d51..cd5a6be46a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_min_flow.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_min_flow.xml
index 1c4230105d..2ea9c59951 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml
index 9cfaed8f27..a72fe4bef7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinFlow/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock.xml
index 78d1d8ba7a..9d94b9e28f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox.xml
index 7c08db4c4e..984a608417 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_min_stock.xml
index 552a7edf9d..d4277a25bf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_min_stock.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>
@@ -240,10 +237,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_min_stock.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_min_stock.xml
index 0f78392bf4..5b46974d9d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_min_stock.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_min_stock.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_p_variation_base_category_list.xml
index 2fc5c904df..867651937e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewMinStock/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml
index 6eb520a57b..02c48e83c3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
index 5353486a72..bc92027b68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
index 96538821f0..5112998875 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
index 6fd51e0373..ca3b41bd3a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
index 23a919151a..14321d9015 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
index 7461c5052a..167b18cdbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio.xml
index eca1fbd9ca..78c4e2dedc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
index 5103abab9c..05c40e95ae 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox.xml
index fc1368ecdb..0ebd8440ee 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1.xml
index da2254f41b..1a9ee06f3e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
index e09d184814..ac6fb393c8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
index b644bacf96..3792b67d90 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
index 9dd45847a5..566a7f1eb2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
index 18b0c7ecc6..3d6e41d85e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
index d20cf97036..9726bc3cd0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice.xml
index 348842988c..162810fa25 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
index 113ef17e4a..d9b84890ee 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox.xml
index e0d5d1b4d9..979be61ac7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
index 25e1892363..461eaa16a7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
index 0eb747c640..c96b27f176 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
index d913a70e56..990df547f1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
index 37d60635b9..0a74dacfe7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
index 6e57bcd9c8..c761e457e1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
index 2d70aeb351..02d046e3f7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList.xml
index 4f29703c0f..2eee4b6af4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList/listbox.xml
index c0e28d962f..72fb3200e4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyModule_viewSaleSupplyList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view.xml
index 34b8f0ad27..c9b80fc8f2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/listbox.xml
index 53178ebb2d..3a105fcef5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_comment.xml
index 1b4cba9d48..eafaf23faf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_description.xml
index b740a0bf5d..b3452b35ce 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_decision_title.xml
index 1e599404a6..14d730454b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_section_title.xml
index b84edd187a..1e942bc08f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_title.xml
index 5a21d7ebe8..79b782c82e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_price_currency.xml
index 0a234cf15d..147f6620d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_decision_title.xml
index 4ccf11d3cc..a07e8cb746 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_section_title.xml
index ccd0628dbd..15d1a68d3b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_title.xml
index 49b4860c06..38840724ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_max.xml
index d9dc27b110..c46f6cc049 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_min.xml
index 558656084f..23a019a088 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_title.xml
index 7a011cf62f..3341889cbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_translated_validation_state_title.xml
index 33ce82496c..4110ecd2c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary.xml
index 4722365c55..3759f032d2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary/listbox.xml
index 410019a9d1..f7d18dabe9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile.xml
index 91f08062d5..2389b3e432 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_administration_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_administration_title.xml
index 22a309f1ba..7422618009 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_administration_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_administration_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_carrier_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_carrier_title.xml
index e0ea500b55..88783ececb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_carrier_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_carrier_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_decision_title.xml
index 1e599404a6..14d730454b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_payment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_payment.xml
index 68147412eb..279e06d0a9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_payment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_payment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_project_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_project_title.xml
index f004bd2f34..d7fea55189 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_project_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_project_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_reference.xml
index 7048d88a5b..8131a979a1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_section_title.xml
index b84edd187a..1e942bc08f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_title.xml
index 5a21d7ebe8..79b782c82e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_administration_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_administration_title.xml
index 47faefeb8f..41e743330b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_administration_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_administration_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_carrier_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_carrier_title.xml
index 97f9fec34e..54de3490f2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_carrier_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_carrier_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_decision_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_decision_title.xml
index 4ccf11d3cc..a07e8cb746 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_decision_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_decision_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_payment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_payment.xml
index c1de371c1f..2785fe09b5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_payment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_payment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_project_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_project_title.xml
index 22ffa4d4a4..50aff9a550 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_project_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_project_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_reference.xml
index 8b98f1a35f..24070dddd9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_section_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_section_title.xml
index ccd0628dbd..15d1a68d3b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_section_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_section_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_title.xml
index 49b4860c06..38840724ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupply_viewProfile/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList.xml
index 20c8a22d43..acad604402 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList/listbox.xml
index fc293283ca..e37ae30e29 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view.xml
index 621d3faa86..e94f5a8a92 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox.xml
index e3b8a42d83..cb69f1cbe8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox_variation_base_category.xml
index 4e8284b590..30e6f3d90b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/listbox_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_aggregated_portal_type_list.xml
index b1867686f3..8226e953af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_aggregated_portal_type_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_base_contribution_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_base_contribution_list.xml
index eb2fbd82f2..cf593d0bbe 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_base_contribution_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_base_contribution_list.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>
@@ -262,10 +259,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>
@@ -278,10 +272,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_comment.xml
index 57c717f220..44fec2d054 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_description.xml
index 3fbcf632c6..5cf7fc3a44 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_individual_variation_base_category.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_individual_variation_base_category.xml
index 0edba0ef63..4e94c6847b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_individual_variation_base_category.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_individual_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_optional_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_optional_variation_base_category_list.xml
index 3dc27eec55..c0a1ab8ea1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_optional_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_optional_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_product_line.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_product_line.xml
index 9fc307f9b0..cb1002473c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_product_line.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_product_line.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_quantity_unit_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_quantity_unit_list.xml
index 2f2e39d098..384cb1e04c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_quantity_unit_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_quantity_unit_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_reference.xml
index c7a7738afe..628fb1f8e0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_required_aggregated_portal_type_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_required_aggregated_portal_type_list.xml
index e937e604a9..4a96f1625a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_required_aggregated_portal_type_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_required_aggregated_portal_type_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_title.xml
index 15291f78d1..b4ae924b68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_translated_validation_state_title.xml
index 9e2b25e2e9..c48ed11615 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_use_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_use_list.xml
index 9f5a360c19..f734983e96 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_use_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_use_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>
@@ -284,10 +281,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_base_category_list.xml
index 4bc0d4162f..8dd3b0e80b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_category_list.xml
index a3b0283d5a..3d1a352324 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_view/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Service_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>
@@ -288,10 +285,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>
@@ -304,10 +298,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>
@@ -320,10 +311,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml
index 9cfa7e35a7..b9b012a66a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_getLocalPredicatePropertyDict.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_getLocalPredicatePropertyDict.xml
index c59fa3a5f6..1d2477f435 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_getLocalPredicatePropertyDict.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_getLocalPredicatePropertyDict.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml
index 44b43b2260..ad94c96535 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asOptionVariationCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asOptionVariationCellRange.xml
index 99bcabe0cd..2d2c886584 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asOptionVariationCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asOptionVariationCellRange.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml
index fedeb02613..c7a2501e1d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml
index 99a3428cff..4aae15fcbe 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_validateQuantityStepList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_validateQuantityStepList.xml
index ce22e79047..3a014672f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_validateQuantityStepList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_validateQuantityStepList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view.xml
index 1cac82bbf0..d5fec4fc59 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_additional_price.xml
index b14767ff25..c6a8e88a40 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_base_price.xml
index 9eeaba7768..7586b97cc9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_base_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_comment.xml
index fbd49344dc..90ce5f9508 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_discount_ratio.xml
index 18432bc5a2..a98c55889d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_exclusive_discount_ratio.xml
index 27ee191caa..8ca6ad9bf4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_non_discountable_additional_price.xml
index c21330652d..886a432af9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_non_discountable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_resource_title.xml
index 4cb4b1b920..50c741bd97 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_surcharge_ratio.xml
index 5ee4c9e052..dee96114e8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_variable_additional_price.xml
index 624cd47d3b..ac4c9e2c65 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_view/my_variable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice.xml
index e9b9ec5068..87299567e8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
index 4fb5965130..74c209f7ba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox.xml
index 4dc5fd6ba9..db69db4b11 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
index 29304a0abc..df8679215d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price.xml
index b14767ff25..c6a8e88a40 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
index 01c5e3b48d..7006d98b4b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_resource_title.xml
index e89483ac76..bdd1ead67f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewAdditionalPrice/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice.xml
index 52b8fa7b4f..8ef5218f12 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/mapped_value_property_list.xml
index bc807ea56a..36ef4d3a63 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox.xml
index c4970dae0e..4a899cb10a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_base_price.xml
index 219b018e45..a63f520612 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_base_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_base_price.xml
index 9eeaba7768..7586b97cc9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_base_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 97989766ff..64cb17e62b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_step_list.xml
index 868bf25756..66830bcdb8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_resource_title.xml
index e89483ac76..bdd1ead67f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio.xml
index 4fc77279ab..59e2ae6713 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/mapped_value_property_list.xml
index 4d46806251..26aac2dce3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox.xml
index 7e36e432ed..04d90d71bb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1.xml
index 23c3cb6005..c6000872fb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
index 1e404ef78f..413d547230 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
index f46ffabaa4..53100b7a91 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio.xml
index 18432bc5a2..a98c55889d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
index a20577e225..655c24f1d0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
index da816abb31..f51cf51788 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_resource_title.xml
index e89483ac76..bdd1ead67f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio.xml
index 46c5802ed7..5a77fa98aa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
index efa1cabef4..3d686485dc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
index 3280f5f619..8f2cf36ea1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
index cc7c41e8dc..76808ab8af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
index fe94a777c3..3aceb9e26e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
index ded261a641..bbcd36b1c7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
index 27ee191caa..8ca6ad9bf4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
index 77ea00a119..f308d4210f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
index d116bc97c2..ebece7bca4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
index e89483ac76..bdd1ead67f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice.xml
index 9c4a7f63cd..99b30534da 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
index 5353486a72..bc92027b68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
index a9213c9a97..69c13fa3a6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
index 6fd51e0373..ca3b41bd3a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_non_discountable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
index c21330652d..886a432af9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
index 7461c5052a..167b18cdbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_non_discountable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
index 760038ca54..88a95efa5f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewNonDiscountableAdditionalPrice/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference.xml
index 51206df4b4..da8c8096fd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/mapped_value_property_list.xml
index 2953203cde..30e05fa20f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox.xml
index b5f9cf0295..2cb9ebd31a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_reference.xml
index 646c3495de..d021524f04 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_comment.xml
index fbd49344dc..90ce5f9508 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_supply_line_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_supply_line_start_date_range_max.xml
index c336b740d2..b4fd80dc80 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_supply_line_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewReference/my_supply_line_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio.xml
index cab281a4e6..294c9b13b3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
index 5103abab9c..05c40e95ae 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox.xml
index 285ea390ad..bf11200b68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1.xml
index 0271476328..1b08efa0d9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
index ed0261f86f..ddd8a4a001 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
index ababea1fd4..7a1a314066 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
index ce75b8df5b..283256330d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox1_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
index f163ecc6d4..4668171a0b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_resource_title.xml
index e89483ac76..bdd1ead67f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
index 5ee4c9e052..dee96114e8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
index 719ce20299..e1d4674f1e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
index 0d5a11237f..67d5acf958 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.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>
@@ -260,10 +257,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice.xml
index 4d0d915d17..68beb40a7e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
index 113ef17e4a..d9b84890ee 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox.xml
index 69442e36e5..958b1eb630 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
index 4f42271e5c..1bf5a9fa8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
index 25e1892363..461eaa16a7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
index 63060488f2..010b3f0097 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
index 9533704974..c73489ee66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
index 88b734ee33..ba4fb62c9a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_priced_quantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
index a50243b438..e8a7d32077 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
index 760038ca54..88a95efa5f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
index ae58da31de..53fcee2548 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
index 624cd47d3b..ac4c9e2c65 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
index 2d70aeb351..02d046e3f7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewVariableAdditionalPrice/my_variable_additional_price_quantity_step_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList.xml
index 6e72b694e1..d728f10293 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList/listbox.xml
index fd9f24d622..6b144cbab1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyModule_viewSupplyList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view.xml
index cb60ca764a..25d3cd8671 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/listbox.xml
index e1482930af..aaf52c5f92 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_description.xml
index 2eaaf13227..7ba9d9eab6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_destination_title.xml
index a40debaebd..55867cb11e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_price_currency.xml
index b1374a662f..825c1d6078 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_administration_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_administration_title.xml
index af29893bb5..e0df797b3a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_administration_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_administration_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_section.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_section.xml
index 1613282358..80476a7e76 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_section.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_source_section.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_max.xml
index 4fa5f80005..55ac81fb5c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_max.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_min.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_min.xml
index 2a1cd67d91..e89b9ec3ec 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_min.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_start_date_range_min.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_title.xml
index ea05f755b6..333651687d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary.xml
index 9a8031c29e..09d68d50ca 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_comment.xml
index ef4f2a6aa8..ffe65196f9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_account.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_account.xml
index 5c09b0ee32..9b404549a2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_account.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_account.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>
@@ -268,10 +265,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>
@@ -284,10 +278,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_title.xml
index d5e4b369be..f7b8459157 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_destination_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_mapped_value_property_list.xml
index 2cf340c5bf..c37484be8c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_base_price.xml
index 35ef2fa2c9..10db8f873e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_base_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_predicate_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_predicate_category_list.xml
index 5cdedeee09..441b2d1051 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_predicate_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_predicate_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_variation_category_list.xml
index 97599e9471..bd3ad4c307 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_matrixbox_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_max_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_max_delay.xml
index 42b243da86..0a96be51b8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_max_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_max_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_delay.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_delay.xml
index d1da806e80..b701c260ad 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_delay.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_delay.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_flow.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_flow.xml
index 2b9016d93a..d95c6b4fb0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_flow.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_min_flow.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml
index d8c034ae24..aecef4fc71 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.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>
@@ -262,10 +259,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>
@@ -278,10 +272,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_price_currency.xml
index 6c69783098..b23c4745c2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_price_currency.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>
@@ -111,10 +108,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_priced_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_priced_quantity.xml
index 54d45f9e0b..7f88b7afc3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_priced_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_priced_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_base_price.xml
index a3ffe35ace..8bc68cc905 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_matrixbox.xml
index 1a72ccdfb8..ba95227a20 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_quantity_step_list.xml
index b3c3670489..26929b21da 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_quantity_step_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>
@@ -323,10 +320,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_reference.xml
index 27977921cf..f3860df866 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_purchase_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_base_price.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_base_price.xml
index 11200936d8..0e68e0fbb1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_base_price.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_base_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_matrixbox.xml
index d0f9cad051..67da6a409f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_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>
@@ -329,10 +326,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>
@@ -345,10 +339,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>
@@ -361,10 +352,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_quantity_step_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_quantity_step_list.xml
index a317415a36..0455b35d44 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_quantity_step_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_quantity_step_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>
@@ -304,10 +301,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>
@@ -320,10 +314,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_reference.xml
index 149fedfa91..b6424e22a8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_sale_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_account.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_account.xml
index 02deccfac2..36e9ae7160 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_account.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_account.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>
@@ -268,10 +265,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>
@@ -284,10 +278,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_title.xml
index dcba6dc3a2..4c482d4a36 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_source_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_start_date_range_max.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_start_date_range_max.xml
index 465a307ca7..cc87c9985c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_start_date_range_max.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SystemPreference_viewResourceData.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SystemPreference_viewResourceData.xml
index c9e25d41e0..37dec9f1ac 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SystemPreference_viewResourceData.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SystemPreference_viewResourceData.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList.xml
index 438a655c57..e25a80b56b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList/listbox.xml
index af0866b958..29864f98e4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationModule_viewTransformationList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_afterClone.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_afterClone.xml
index 4facdef2e3..510d114f6e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_afterClone.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_afterClone.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view.xml
index 24e5094def..434a2774b1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_comment.xml
index 767d39ce28..db4e525908 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_description.xml
index 21e0024fa3..a1f190f576 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_efficiency.xml
index 768f328245..a1df8b704b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_industrial_phase.xml
index c66082a93f..3881e1413c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_industrial_phase.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_int_index.xml
index a613bfebf1..c2eb5ef3af 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity.xml
index 257a43735f..fab7fa08ca 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity_unit.xml
index 54b642586c..42fb32074b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_reference.xml
index 3e4e71a958..a47bc0026f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_resource_title.xml
index 63d02d1523..995b520275 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_specialise_title.xml
index 24ac2294a7..bf19372298 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_title.xml
index fc1e40b1a6..069f23f8b6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary.xml
index 22b65ea5b6..ff790f59e1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_description.xml
index 30196fa9ae..528d5d3506 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_efficiency.xml
index 529f1e27bb..fcdcc9c30f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_industrial_phase.xml
index 60ddbbfe19..3de7592134 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_industrial_phase.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_int_index.xml
index 355cd0e7d4..a073236e2d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_q_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_q_variation_base_category_list.xml
index 45a78314d0..4bbebc763c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_q_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_q_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity.xml
index 172174a48f..9af078e413 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_matrixbox.xml
index 33df184b54..acec45ab39 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_unit.xml
index 551cf39cc3..a1339442b1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_reference.xml
index 39de387492..369f6d28c4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_resource_title.xml
index 99fecc22b3..8335dd8175 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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>
@@ -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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title.xml
index 1f2c6cecac..4682f07c94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title_list.xml
index 4466110ac1..e31eb85f5f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_specialise_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_title.xml
index 312dac9407..5b5746d57e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_v_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_v_variation_base_category_list.xml
index bd132e8af3..bf8d045682 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_v_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_v_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_category_list.xml
index 3acf12a664..7c8f5b5d21 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_matrixbox.xml
index 3ff658c345..9dd8f2d39d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewFieldLibrary/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity.xml
index b1e95ea8a7..2dee7f084e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/mapped_value_property_list.xml
index a589af11e0..a9d7cd9aa2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox.xml
index 33b8619285..5cab64dbad 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_membership_criterion_category_list.xml
index 3a463f4872..66db956334 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_quantity.xml
index dcb4662491..fd5c1e415b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/matrixbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/membership_criterion_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/membership_criterion_base_category_list.xml
index 58bc20f4cb..b09f4a6301 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_q_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_q_variation_base_category_list.xml
index 403be2b998..62aa43301e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_q_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_q_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity.xml
index 503072b379..9f7d171436 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity_unit.xml
index 9f8629066d..4df00189d3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_resource_title.xml
index 8457b6f975..809d20c54e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_specialise_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_specialise_title_list.xml
index da9c9fb1b0..cf475fcd31 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_specialise_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_specialise_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation.xml
index 776d47b89e..06e1121e66 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/mapped_value_property_list.xml
index c7c8ae4306..34311ecd6e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox.xml
index 93f12143c7..35ba571a19 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_category_list.xml
index 055fd2a244..37b7cb9987 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_membership_criterion_category_list.xml
index bddf7645fe..4948be2e73 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/membership_criterion_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/membership_criterion_base_category_list.xml
index 41512de04b..b707f32cc5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_resource_title.xml
index 8457b6f975..809d20c54e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_v_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_v_variation_base_category_list.xml
index 364bcdfc84..404c75afbd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_v_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_v_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_variation_category_list.xml
index dbc8f5dc1a..c6c5855534 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOperation_viewVariation/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_afterClone.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_afterClone.xml
index 189947f72a..4704f996fa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_afterClone.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_afterClone.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_asPredicate.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_asPredicate.xml
index abe2b32497..5d89160abb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_asPredicate.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view.xml
index 8c9b26775d..577a384451 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_comment.xml
index 767d39ce28..db4e525908 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_description.xml
index 21e0024fa3..a1f190f576 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_efficiency.xml
index c3ea8e178e..c378ea6dc5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_industrial_phase.xml
index 6631e96d8c..c6d4259d9e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_industrial_phase.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_int_index.xml
index cedf32e044..84f946ed01 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_option.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_option.xml
index e3ae38821b..b88029783e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_option.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_option.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity.xml
index 257a43735f..fab7fa08ca 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity_unit.xml
index 6da0b21004..50f7ccbfbb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_reference.xml
index 3e4e71a958..a47bc0026f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_resource_title.xml
index 75fe40a446..d25ba144aa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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>
@@ -111,10 +108,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_specialise_title.xml
index 4de7f5bd6f..e0c7faf425 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_title.xml
index fc1e40b1a6..069f23f8b6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_variation_category_list.xml
index 2a1dfd1e56..e3d8690a03 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_view/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary.xml
index dd2953335b..ee07981846 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_description.xml
index 30196fa9ae..528d5d3506 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_efficiency.xml
index 529f1e27bb..fcdcc9c30f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_industrial_phase.xml
index 60ddbbfe19..3de7592134 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_industrial_phase.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_int_index.xml
index 355cd0e7d4..a073236e2d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_option.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_option.xml
index 84f909ca72..a10390dd97 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_option.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_option.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity.xml
index 172174a48f..9af078e413 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity_unit.xml
index 551cf39cc3..a1339442b1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_reference.xml
index 39de387492..369f6d28c4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_resource_title.xml
index 953983258f..3b05abf620 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_specialise_title.xml
index 1f2c6cecac..4682f07c94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_title.xml
index 312dac9407..5b5746d57e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_variation_category_list.xml
index 3acf12a664..7c8f5b5d21 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationOptionalResource_viewFieldLibrary/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_afterClone.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_afterClone.xml
index 311f070777..76b7fd20bd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_afterClone.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_afterClone.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view.xml
index 651d5c04a9..0de75ec7c2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_comment.xml
index 767d39ce28..db4e525908 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_description.xml
index 21e0024fa3..a1f190f576 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_efficiency.xml
index 529f1e27bb..fcdcc9c30f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_industrial_phase.xml
index 60ddbbfe19..3de7592134 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_industrial_phase.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_int_index.xml
index 355cd0e7d4..a073236e2d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity.xml
index 257a43735f..fab7fa08ca 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity_unit.xml
index 551cf39cc3..a1339442b1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_reference.xml
index 3e4e71a958..a47bc0026f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_resource_title.xml
index b8a55774e7..ebb557433c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_specialise_title.xml
index 95a11af97c..c00309b861 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_title.xml
index fc1e40b1a6..069f23f8b6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_variation_category_list.xml
index 3acf12a664..7c8f5b5d21 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_view/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary.xml
index 5ef1a6ebd7..27e7a720ae 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_efficiency.xml
index 6ea0ec173f..66cf6c7ca9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_industrial_phase.xml
index ee531a509f..d84fd36ffd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_industrial_phase.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>
@@ -111,10 +108,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_int_index.xml
index 3555e3a3a7..a9af4570ee 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_q_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_q_variation_base_category_list.xml
index 360ce67f97..f198784886 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_q_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_q_variation_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity.xml
index 66bcdb5a5a..7b31391d75 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml
index 8511496d99..b37ac9c1f0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_unit.xml
index e25b392446..1a1785d290 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_reference.xml
index 294212529a..63f35ba89e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_resource_title.xml
index e690472ac7..11a9d3db7d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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>
@@ -142,10 +139,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>
@@ -158,10 +152,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title.xml
index 0e8f6df808..6b56a78140 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title_list.xml
index 2ba7e961ca..e0f8f838bc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_specialise_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_title.xml
index ea78bd553c..0397f4f20c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_v_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_v_variation_base_category_list.xml
index c2967f61ef..40f6610e7f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_v_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_v_variation_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_category_list.xml
index eb910bdb91..19fa232877 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml
index ebb29971ae..e8ad62b4e4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity.xml
index ce7618b116..8f73cdaf94 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/mapped_value_property_list.xml
index a589af11e0..a9d7cd9aa2 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox.xml
index cd760179d7..bfe5a160a5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_membership_criterion_category_list.xml
index 3a463f4872..66db956334 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml
index 6f4f79f771..c3e13a9534 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/membership_criterion_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/membership_criterion_base_category_list.xml
index a7e27e5a39..8c5b92d1e5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_q_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_q_variation_base_category_list.xml
index 45a78314d0..4bbebc763c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_q_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_q_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity.xml
index 503072b379..9f7d171436 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity_unit.xml
index 77e4629811..e0a944d5bb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_resource_title.xml
index 41595b3924..3658328e33 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_specialise_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_specialise_title_list.xml
index 608bbdab7b..95952ade68 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_specialise_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_specialise_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation.xml
index cad7de5c0b..8a972ea0fa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/mapped_value_property_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/mapped_value_property_list.xml
index c7c8ae4306..34311ecd6e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/mapped_value_property_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox.xml
index 75369c5bc0..d46108c8b4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_category_list.xml
index 827ebd7ee6..82937df6f5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_membership_criterion_category_list.xml
index bddf7645fe..4948be2e73 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/matrixbox_membership_criterion_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/membership_criterion_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/membership_criterion_base_category_list.xml
index 41512de04b..b707f32cc5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_resource_title.xml
index 41595b3924..3658328e33 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_v_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_v_variation_base_category_list.xml
index bd132e8af3..bf8d045682 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_v_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_v_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_variation_category_list.xml
index 3acf12a664..7c8f5b5d21 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewVariation/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.xml
index 7f55852823..d5ae1f8825 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getAggregatedAmountList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getReportSectionList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getReportSectionList.xml
index d8f6612493..f18e9628cf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getReportSectionList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getReportSectionList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml
index 75af792a6d..a37290fbfb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml
index 91816d4b6a..9ff664c6a6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_updateVariationCategoryList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_updateVariationCategoryList.xml
index a0f9bc7992..0903de6a91 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_updateVariationCategoryList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_updateVariationCategoryList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view.xml
index bd3c829ac7..aa9463b356 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox.xml
index b66c9aa329..0e425aa4c3 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_efficiency.xml
index b6fbca4eef..5ad3b3b427 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_industrial_phase.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_industrial_phase.xml
index 0b20e4a202..757c60698d 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_industrial_phase.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_industrial_phase.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>
@@ -117,10 +114,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>
@@ -133,10 +127,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_int_index.xml
index 56c637fed0..efb72011e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity.xml
index d0fdb01be0..c3774b37eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity_unit.xml
index 41f454213c..a2676ec2f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_reference.xml
index 0658c248ba..bff70afc8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/listbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_comment.xml
index 2c7f5cc93e..a3dcb90b69 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_description.xml
index 21e0024fa3..a1f190f576 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_reference.xml
index f61e6248a5..9a468282b7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_resource_title.xml
index 5af4a967d1..6880b26678 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_template_transformation_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_template_transformation_title_list.xml
index 23f3b61c7b..75b7f60d0e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_template_transformation_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_template_transformation_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_title.xml
index fc1e40b1a6..069f23f8b6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_translated_validation_state_title.xml
index 33ce82496c..4110ecd2c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_variation_base_category_list.xml
index 076d281037..a95f68c8d5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_variation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_version.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_version.xml
index 6a6ad9d0bb..c82ca5a411 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_version.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_view/my_version.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded.xml
index f687d4ce45..6eb7e99171 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox.xml
index c75147dd15..9915b5b129 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/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>
@@ -231,10 +228,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -247,10 +241,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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_converted_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_converted_quantity.xml
index f2d59d37c9..f2873cb5f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_converted_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_converted_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_efficiency.xml
index 56fbfb2761..99266b4995 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getResourcePrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getResourcePrice.xml
index 67fdde44d4..a4f7af5fd6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getResourcePrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getResourcePrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getTotalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getTotalPrice.xml
index da1a27aa1f..54e180f350 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getTotalPrice.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_getTotalPrice.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_quantity.xml
index 75214eac9d..09cb120415 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_resource_default_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_resource_default_quantity_unit.xml
index 63ecf4d69c..87599a4c1e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_resource_default_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/listbox_resource_default_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/reference_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/reference_variation_category_list.xml
index 2e5099eed7..ba788eeffa 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/reference_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewExpanded/reference_variation_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>
@@ -129,10 +126,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>
@@ -145,10 +139,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary.xml
index 2388d97c88..667516ac8b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_comment.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_comment.xml
index 06555dcada..9a170e82c5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_comment.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_description.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_reference.xml
index 294212529a..63f35ba89e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_resource_title.xml
index 86203515db..932f1374be 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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>
@@ -151,10 +148,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>
@@ -167,10 +161,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_template_transformation_title_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_template_transformation_title_list.xml
index a4dd76f355..3fec3159e1 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_template_transformation_title_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_template_transformation_title_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_title.xml
index ea78bd553c..0397f4f20c 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_transformation_content_list_listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_transformation_content_list_listbox.xml
index b6f85b63af..e46d1bb78a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_transformation_content_list_listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_transformation_content_list_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_translated_validation_state_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_translated_validation_state_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_variation_base_category_list.xml
index e916308618..f7a9349256 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewFieldLibrary/my_variation_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>
@@ -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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport.xml
index 14e48b76e9..72ba68b79f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/your_reportbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/your_reportbox.xml
index 366a8404a2..4e86f80bba 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/your_reportbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReport/your_reportbox.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog.xml
index 6a6b3109bc..4b1df01699 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_format.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_format.xml
index fcd61518c5..263db24aff 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_format.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_portal_skin.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_portal_skin.xml
index fcfa8e62f9..46dea8f260 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_portal_skin.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_portal_skin.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_price_currency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_price_currency.xml
index 87b4d35152..02aa5ad980 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_price_currency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_price_currency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_variation_category_list.xml
index 61c16ea39a..695314e471 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewGlobalReportDialog/your_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>
@@ -284,10 +281,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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList.xml
index ea1d455404..f6e24a069a 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox.xml
index 6b203962ff..5d3223a8e6 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_efficiency.xml
index 814e6b6c69..822f0012e0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_int_index.xml
index 56c637fed0..efb72011e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity.xml
index d0fdb01be0..c3774b37eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity_unit.xml
index 41f454213c..a2676ec2f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_reference.xml
index 0658c248ba..bff70afc8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/listbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOperationList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList.xml
index cd8000a96c..b8a1ed9066 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox.xml
index e90a57cc31..2e8c010d83 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_efficiency.xml
index 814e6b6c69..822f0012e0 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_int_index.xml
index 56c637fed0..efb72011e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity.xml
index d0fdb01be0..c3774b37eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity_unit.xml
index 41f454213c..a2676ec2f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_reference.xml
index 0658c248ba..bff70afc8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/listbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationOptionalResourceList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList.xml
index 53aef0b20e..759b43476f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox.xml
index f239b90e80..ea0e5e796e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_efficiency.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_efficiency.xml
index b6fbca4eef..5ad3b3b427 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_efficiency.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_efficiency.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_int_index.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_int_index.xml
index 56c637fed0..efb72011e9 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_int_index.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity.xml
index d0fdb01be0..c3774b37eb 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity_unit.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity_unit.xml
index 41f454213c..a2676ec2f4 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity_unit.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_quantity_unit.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_reference.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_reference.xml
index 0658c248ba..bff70afc8e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_reference.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/listbox_reference.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/my_title.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/my_title.xml
index 92a49528ed..8a35b65ad5 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/my_title.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_viewTransformationTransformedResourceList/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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml
index c52c67296f..3daaa709e7 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrix.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrix.xml
index 623da60971..14231ec786 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrix.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrix.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm.xml
index 819b48887b..5dbe63591f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_quantity.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_quantity.xml
index e2638e05b9..b8a6660828 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_quantity.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_variation_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_variation_category_list.xml
index aaafbb0cdc..46f1fc11df 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_variation_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeQuantityMatrixForm/my_reference_variation_category_list.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>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeVariationMatrix.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeVariationMatrix.xml
index 78dbc1662a..5ec3dbe562 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeVariationMatrix.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_completeVariationMatrix.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_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_hashVariationCategoryItemList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_hashVariationCategoryItemList.xml
index 9d8e4e5b1a..d6a21564ce 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_hashVariationCategoryItemList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_hashVariationCategoryItemList.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_pdm/bt/revision b/bt5/erp5_pdm/bt/revision
index d759b56ecc..be8a1b91d5 100644
--- a/bt5/erp5_pdm/bt/revision
+++ b/bt5/erp5_pdm/bt/revision
@@ -1 +1 @@
-537
\ No newline at end of file
+538
\ No newline at end of file
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/configuration.xml
index 450ce9368e..e4bb3334bc 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/view.xml
index ab3322cf6d..0dd2f0cdd5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester/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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/configuration.xml
index 13353cc233..da6897dca9 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/view.xml
index ab3322cf6d..0dd2f0cdd5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/DateTime%20Divergence%20Tester/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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/configuration.xml
index 51b2bb03e0..12635c344b 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/view.xml
index ab3322cf6d..0dd2f0cdd5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Float%20Divergence%20Tester/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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml
index 51b2bb03e0..12635c344b 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml
index ab3322cf6d..0dd2f0cdd5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester/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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
index 452147ceaa..a42b3832e1 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/configuration.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>
@@ -72,10 +69,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>
@@ -88,10 +82,7 @@
   </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_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
index 307540c3e8..347da8ec22 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Decision/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_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml
index 0bb9d54b68..7c65fb77bd 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process%20Tool/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>
@@ -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>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml
index 290e31f51c..cea502b831 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Process/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_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml
index 0bb9d54b68..7c65fb77bd 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Tool/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>
@@ -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>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml
index 894be87e76..7b5090c410 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/action_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>
@@ -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_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml
index da90d27781..369277fe53 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/predicate_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>
@@ -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_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml
index 2b78d6c59e..682bba292b 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/role_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>
@@ -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_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml
index 62e03be33c..8b0c2f7313 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/solver_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>
@@ -73,10 +70,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_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml
index 79c5df70b8..99795477e6 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/translation_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>
@@ -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_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml
index 6c03a6dc4c..fd8e3519ef 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/update_local_roles.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_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml
index 1cd5eabc00..b6e3ca3dbf 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Solver%20Type/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>
@@ -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_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/predicate.xml
index 799d6ae209..fd3c01f455 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/view.xml
index ab3322cf6d..0dd2f0cdd5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Specialise%20Divergence%20Tester/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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/configuration.xml
index 9f51c83647..ebaf4f5fbf 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/view.xml
index c14bc42baa..6bf7819c69 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/String%20Divergence%20Tester/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>
@@ -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>
diff --git a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/configuration.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/configuration.xml
index f96b2c1554..d287f286e5 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/configuration.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/configuration.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/predicate.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/predicate.xml
index d7b5460d26..5b537f540f 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/predicate.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/predicate.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>
@@ -76,10 +73,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_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/view.xml b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/view.xml
index c14bc42baa..6bf7819c69 100644
--- a/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/view.xml
+++ b/bt5/erp5_simulation/ActionTemplateItem/portal_types/Variation%20Divergence%20Tester/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>
@@ -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>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
index 26f8d128f0..86814c3a86 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Category%20Membership%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
index 5c0b283b74..722f297721 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/DateTime%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -57,10 +54,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,10 +71,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
index d6fda8dafa..822e7b37ab 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Float%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
index 70acde5922..be9a86fef5 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Net%20Converted%20Quantity%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
index ad8f4a5267..f3d4927ee5 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Decision.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
index 7f20399c8a..356b6c9f1c 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process%20Tool.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
index 13b21a2ebc..bfed5dd5ae 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Process.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -83,10 +80,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -103,10 +97,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
index dbb89fe999..40831b7d38 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,10 +82,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,10 +99,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml
index fb21a54c8c..5a510ba8f5 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Type.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -61,10 +58,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -81,10 +75,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Specialise%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Specialise%20Divergence%20Tester.xml
index 047dd74ef8..1eed34367e 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Specialise%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Specialise%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -97,10 +94,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -117,10 +111,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
-        <tuple/>
-      </tuple>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
index bc2ca6a7a0..61b24a03e4 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/String%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
index bbced5190c..df69a3a6f9 100644
--- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
+++ b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Variation%20Divergence%20Tester.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation.xml
index 68ca065b52..dcfa8d00cf 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml
index aac1dfaad6..62ac2085a0 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration.xml
index b392a3d5bd..c16963609f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property.xml
index 02836d528b..7057d6ca15 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property_title.xml
index c90059b709..eb5caf501e 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/CategoryMembershipDivergenceTester_viewConfiguration/my_tested_property_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration.xml
index 56258480ca..85b82e2689 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity.xml
index 919a5690ba..ec325e813d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_max.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_max.xml
index 30e4ba12fe..868f0f405c 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_max.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_max.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_min.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_min.xml
index 0af68036a9..708813d5a0 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_min.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_quantity_range_min.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property.xml
index 02836d528b..7057d6ca15 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property_title.xml
index c90059b709..eb5caf501e 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DateTimeDivergenceTester_viewConfiguration/my_tested_property_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
index 26d91207c7..059a12f682 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml
index 1256db5ee9..977f0a5cb4 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.xml
index e78d41f464..c5a2a72c0f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml
index f167c3ac3a..1b7f3c7f74 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
index 199d1a6d9d..902b77ad40 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -565,10 +562,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_comment.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_comment.xml
index 2a30d8f2a0..af47a13190 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_comment.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_comment.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml
index 55671e1377..a462433707 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver.xml
index 694d1b7a61..671aa38cfd 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver.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>
@@ -146,10 +140,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
index 29a5c4e104..db3ed002d6 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FormBox" module="Products.ERP5Form.FormBox"/>
-        <tuple/>
-      </tuple>
+      <global name="FormBox" module="Products.ERP5Form.FormBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -178,10 +175,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>
@@ -194,10 +188,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml
index 570df2e68d..458ab040ce 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/your_workflow_action.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/your_workflow_action.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration.xml
index 31edc6e834..975e0e750d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_alignment_enabled.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_alignment_enabled.xml
index d0fec94f5b..7901e6ab66 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_alignment_enabled.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_alignment_enabled.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_exponent.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_exponent.xml
index d423ba0908..e792ccc96d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_exponent.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_exponent.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_rounding_option.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_rounding_option.xml
index f6a382c494..24b4640ada 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_rounding_option.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_decimal_rounding_option.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>
@@ -266,10 +263,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_max.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_max.xml
index b8d0197067..299605071a 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_max.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_min.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_min.xml
index dfd466b2b8..3c34ea83db 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_range_min.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_quantity_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property.xml
index 02836d528b..7057d6ca15 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property_title.xml
index c90059b709..eb5caf501e 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tested_property_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_base.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_base.xml
index 38fa12096a..07b2d20a13 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_base.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_base.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_max.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_max.xml
index 1539d93f31..46a73c6d19 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_max.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_min.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_min.xml
index 039dc90b35..06bd82ca08 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_range_min.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/FloatDivergenceTester_viewConfiguration/my_tolerance_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox.xml
index eebfe0ea54..341eb421d9 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_delivery_solver.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_delivery_solver.xml
index 7bf3f46f5b..a9c72ab599 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_delivery_solver.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_delivery_solver.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>
@@ -141,10 +138,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>
@@ -157,10 +151,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>
@@ -173,10 +164,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_start_date.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_start_date.xml
index 7f75074c79..5dd3d7149c 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_start_date.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_start_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>
@@ -126,10 +123,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>
@@ -142,10 +136,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_stop_date.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_stop_date.xml
index cd318f52af..5017a4a906 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_stop_date.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/QuantitySplitSolver_viewConfigurationFormBox/my_stop_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>
@@ -126,10 +123,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>
@@ -142,10 +136,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_testFalse.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_testFalse.xml
index 26e1ad9020..ef829ec281 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_testFalse.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_testFalse.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view.xml
index 758420bcd3..28a36a6196 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox.xml
index e9c280af1b..00daed1988 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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>
@@ -172,10 +169,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_divergence_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_divergence_provider.xml
index 17258403de..55be39fb75 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_divergence_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_divergence_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_matching_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_matching_provider.xml
index 11dffb739f..8ecd49d497 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_matching_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_matching_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_tested_property_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_tested_property_list.xml
index 667217e63b..a69a1cc1e2 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_tested_property_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_tested_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_updating_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_updating_provider.xml
index c10cd906fc..b8a53dff3d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_updating_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/listbox_updating_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox.xml
index 37c65a48d0..7dddd47e4f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox_mapping_property_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox_mapping_property_list.xml
index 731fc51fc3..6a6a69b74f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox_mapping_property_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/mapped_property_listbox_mapping_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_description.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_description.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_reference.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_reference.xml
index 9f3fa6b158..c7585c7dfc 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_reference.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_reference.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_max.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_max.xml
index 05cf6d0244..bd3f8eb813 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_max.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_min.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_min.xml
index 8069982970..d81f41e5e8 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_start_date_range_min.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_test_method_id.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_test_method_id.xml
index 292f70e13e..a50fc0d16d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_test_method_id.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_test_method_id.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_title.xml
index 1869707a6e..10dda70494 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_trade_phase_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_trade_phase_list.xml
index fe0c681d37..b7b044497f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_trade_phase_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_trade_phase_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>
@@ -111,10 +108,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_translated_validation_state_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_translated_validation_state_title.xml
index 09b130ec8d..38145b50e8 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_version.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_version.xml
index dd3b6acebf..bdfccb4acd 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_version.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_version.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDeliverySolverList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDeliverySolverList.xml
index e5b15ebe25..3a6c42eaf9 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDeliverySolverList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDeliverySolverList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml
index 4fe90f6d49..d5f4a45425 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList.xml
index a861fa03ee..7caf0a0f38 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList/listbox.xml
index 0135a82787..4a2a478a8e 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewDeliverySolverList/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>
@@ -144,10 +141,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList.xml
index 5d7e786634..42f811505c 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList/listbox.xml
index e3291509cd..d8f66585e7 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSimulationMovementSnapshotList/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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList.xml
index fe4163f8f5..4c9b3b25b9 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList/listbox.xml
index e3291509cd..d8f66585e7 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_viewSolverDecisionList/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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList.xml
index a4fe404c87..ab7b6cea4f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList/listbox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList/listbox.xml
index 0dbe811d81..ebd2192e67 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList/listbox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverTool_viewSolverProcessList/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>
@@ -135,10 +132,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration.xml
index f545c4c251..7689224951 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
index 832c233bc8..9e9202686b 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="FormBox" module="Products.ERP5Form.FormBox"/>
-        <tuple/>
-      </tuple>
+      <global name="FormBox" module="Products.ERP5Form.FormBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -176,10 +173,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.xml
index c166ccbcdb..c379c57856 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration.xml
index 56cddabe79..5e7e4611ce 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property.xml
index 02836d528b..7057d6ca15 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property_title.xml
index c90059b709..eb5caf501e 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/StringDivergenceTester_viewConfiguration/my_tested_property_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view.xml
index fd1d39c1ff..3d64418852 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_delivery_title_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_delivery_title_list.xml
index 817aacf811..8482c83bb1 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_delivery_title_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_delivery_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>
@@ -583,10 +580,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_portal_type.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_portal_type.xml
index 0ed04989e1..7126d7c1b9 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_portal_type.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TargetSolver_view/my_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view.xml
index 61c7d3ef30..3135099922 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view/my_tested_property.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view/my_tested_property.xml
index 02836d528b..7057d6ca15 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view/my_tested_property.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/TesterType_view/my_tested_property.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view.xml
index c16abc9650..76fcd7b27d 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_description.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_description.xml
index 07dc3bb171..e98bd2614b 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_description.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_divergence_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_divergence_provider.xml
index d9ee0bbecd..9c20d4532f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_divergence_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_divergence_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_matching_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_matching_provider.xml
index 07b834384b..19b3cc3d5b 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_matching_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_matching_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_portal_type.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_portal_type.xml
index adc8c41ef7..97faf57c7c 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_portal_type.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_portal_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_solver_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_solver_list.xml
index 946d2b566e..dd90963e6f 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_solver_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_solver_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>
@@ -137,10 +134,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_title.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_title.xml
index 52c14350f1..c5bf384370 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_title.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_updating_provider.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_updating_provider.xml
index 634fac5b31..135e7e7168 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_updating_provider.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Tester_view/my_updating_provider.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getConfigurationPropertyListDict.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getConfigurationPropertyListDict.xml
index 0c99684bae..507159cec1 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getConfigurationPropertyListDict.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getConfigurationPropertyListDict.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getDefaultConfigurationPropertyDict.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getDefaultConfigurationPropertyDict.xml
index d75ef1754b..9977fb76d2 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getDefaultConfigurationPropertyDict.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_getDefaultConfigurationPropertyDict.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox.xml
index 468d0fbe23..65d707ded0 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox.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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_tested_property_list.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_tested_property_list.xml
index 96d9f5c6b0..d293b2108b 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_tested_property_list.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_tested_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>
@@ -164,10 +161,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>
@@ -180,10 +174,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>
@@ -196,10 +187,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_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_value.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_value.xml
index 796d57bc1a..d32e493f67 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_value.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/UnifySolver_viewConfigurationFormBox/my_value.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>
@@ -141,10 +138,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>
@@ -157,10 +151,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>
@@ -173,10 +164,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_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index aa59885c83..70e1a64c23 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-143
\ No newline at end of file
+144
\ No newline at end of file
-- 
2.30.9