From 587f5c107e5285a894dafc3c44f0bae2f587ad28 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Thu, 13 Mar 2008 16:38:08 +0000
Subject: [PATCH] Update to last XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19856 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Project%20Cell/view.xml      | 14 ++--
 .../Project%20Line/add_task_related.xml       | 14 ++--
 .../Project%20Line/available_budget.xml       | 14 ++--
 .../Project%20Line/constraint.xml             | 14 ++--
 .../Project%20Line/consumed_budget.xml        | 14 ++--
 .../portal_types/Project%20Line/contents.xml  | 14 ++--
 .../Project%20Line/current_budget.xml         | 14 ++--
 .../portal_types/Project%20Line/documents.xml | 14 ++--
 .../portal_types/Project%20Line/files.xml     | 21 ++----
 .../Project%20Line/initial_budget.xml         | 14 ++--
 .../jump_to_related_sale_order_lines.xml      | 14 ++--
 .../portal_types/Project%20Line/task_list.xml | 21 ++----
 .../portal_types/Project%20Line/view.xml      | 14 ++--
 .../Project%20Milestone/constraint.xml        | 14 ++--
 .../portal_types/Project%20Milestone/view.xml | 14 ++--
 .../portal_types/Project%20Module/view.xml    | 14 ++--
 .../portal_types/Project/add_task_related.xml | 14 ++--
 .../portal_types/Project/content.xml          | 14 ++--
 .../portal_types/Project/detailed_report.xml  | 14 ++--
 .../portal_types/Project/documents.xml        | 14 ++--
 .../portal_types/Project/files.xml            | 21 ++----
 .../jump_to_related_sale_order_lines.xml      | 14 ++--
 .../portal_types/Project/milestone.xml        | 21 ++----
 .../portal_types/Project/planning.xml         | 21 ++----
 .../portal_types/Project/project_lines.xml    | 14 ++--
 .../portal_types/Project/report.xml           | 14 ++--
 .../portal_types/Project/task_list.xml        | 21 ++----
 .../portal_types/Project/view.xml             | 14 ++--
 .../detailed_report.xml                       | 14 ++--
 .../Requirement%20Document/orphaned.xml       | 14 ++--
 .../project_mapping.xml                       | 14 ++--
 .../Requirement%20Document/view.xml           | 14 ++--
 .../Requirement%20Module/fast_input.xml       | 14 ++--
 .../Requirement%20Module/view.xml             | 14 ++--
 .../portal_types/Requirement/project_list.xml | 14 ++--
 .../portal_types/Requirement/view.xml         | 14 ++--
 .../Sale%20Order%20Line/line_profile.xml      | 14 ++--
 .../Sale%20Order%20Line/project.xml           | 14 ++--
 .../Sale%20Order%20Milestone/line_profile.xml | 14 ++--
 .../Sale%20Order%20Milestone/project.xml      | 14 ++--
 .../Sale%20Order%20Milestone/view.xml         | 14 ++--
 .../Sale%20Order/detailed_report.xml          | 14 ++--
 .../Sale%20Order/milestone_view.xml           | 21 ++----
 .../line_profile.xml                          | 14 ++--
 .../Sale%20Packing%20List%20Line/project.xml  | 14 ++--
 .../portal_types/Task%20Line/price_view.xml   | 21 ++----
 .../Task%20Line/quantity_view.xml             | 21 ++----
 .../portal_types/Task%20Line/view.xml         | 14 ++--
 .../Task%20Module/planning_report.xml         | 21 ++----
 .../portal_types/Task%20Module/view.xml       | 14 ++--
 .../Task%20Module/workflow_report.xml         | 14 ++--
 .../Task%20Report%20Line/price_view.xml       | 21 ++----
 .../Task%20Report%20Line/quantity_view.xml    | 21 ++----
 .../Task%20Report%20Line/view.xml             | 14 ++--
 .../icalendar_export.xml                      | 14 ++--
 .../planning_report.xml                       | 21 ++----
 .../Task%20Report%20Module/view.xml           | 14 ++--
 .../workflow_report.xml                       | 14 ++--
 .../Task%20Report/expense_view.xml            | 14 ++--
 .../Task%20Report/jump_to_related_task.xml    | 14 ++--
 .../Task%20Report/payment_condition.xml       | 14 ++--
 .../Task%20Report/profile_view.xml            | 14 ++--
 .../portal_types/Task%20Report/view.xml       | 14 ++--
 .../Task%20Report/view_discount.xml           | 14 ++--
 .../Task/apply_trade_condition.xml            | 14 ++--
 .../portal_types/Task/constraint.xml          | 14 ++--
 .../portal_types/Task/duplicate_task.xml      | 21 ++----
 .../Task/jump_to_related_task_report.xml      | 14 ++--
 .../portal_types/Task/payment_condition.xml   | 14 ++--
 .../portal_types/Task/profile_view.xml        | 14 ++--
 .../portal_types/Task/view.xml                | 14 ++--
 .../portal_types/Task/view_discount.xml       | 14 ++--
 .../portal_categories/predecessor.xml         | 65 +-----------------
 .../portal_categories/requirement.xml         | 65 +-----------------
 .../task_invoice_builder.xml                  |  7 +-
 .../portal_deliveries/task_report_builder.xml |  7 +-
 .../portal_domains/task_module_domain.xml     |  9 +--
 .../task_module_person_domain.xml             |  7 +-
 .../task_report_module_domain.xml             |  7 +-
 .../task_report_module_person_domain.xml      |  7 +-
 .../portal_types/Project%20Cell.xml           |  7 +-
 .../portal_types/Project%20Line.xml           |  7 +-
 .../portal_types/Project%20Milestone.xml      |  7 +-
 .../portal_types/Project%20Module.xml         |  7 +-
 .../portal_types/Requirement%20Module.xml     |  7 +-
 .../portal_types/Requirement.xml              |  7 +-
 .../portal_types/Sale%20Order%20Milestone.xml |  7 +-
 .../portal_types/Task%20Line.xml              |  7 +-
 .../portal_types/Task%20Module.xml            |  7 +-
 .../portal_types/Task%20Report%20Line.xml     |  7 +-
 .../portal_types/Task%20Report%20Module.xml   |  7 +-
 .../portal_types/Task%20Report.xml            |  7 +-
 .../portal_types/Task.xml                     | 66 +++++++++++++++++--
 .../portal_skins/erp5_project.xml             |  7 +-
 .../erp5_project/ExpenseLine_view.xml         |  7 +-
 .../ExpenseModule_viewExpenseList.xml         |  7 +-
 .../erp5_project/Expense_view.xml             |  7 +-
 .../Movement_getSimulationStateColorText.xml  |  7 +-
 .../ProjectLine_addTaskFastInput.xml          |  7 +-
 .../ProjectLine_generateTasks.xml             |  7 +-
 .../ProjectLine_getAggregatedQuantity.xml     |  8 +--
 .../ProjectLine_getRequirimentStringList.xml  |  7 +-
 .../erp5_project/ProjectLine_getWorkList.xml  |  7 +-
 .../erp5_project/ProjectLine_view.xml         |  7 +-
 .../erp5_project/ProjectLine_view/listbox.xml |  4 +-
 .../ProjectLine_view/listbox_quantity.xml     |  4 +-
 .../ProjectLine_view/my_int_index.xml         |  2 +-
 .../ProjectLine_view/my_quantity.xml          |  2 +-
 .../ProjectLine_viewAvailableBudget.xml       |  7 +-
 .../my_resource_title.xml                     |  2 +-
 .../ProjectLine_viewConstraint.xml            |  7 +-
 .../ProjectLine_viewConstraint/my_title.xml   |  2 +-
 .../ProjectLine_viewConsumedBudget.xml        |  7 +-
 .../my_resource_title.xml                     |  2 +-
 .../ProjectLine_viewCurrentBudget.xml         |  7 +-
 .../ProjectLine_viewDocumentList.xml          | 17 ++---
 .../ProjectLine_viewDocumentList/listbox.xml  | 20 +++---
 .../my_description.xml                        |  2 +-
 .../ProjectLine_viewFieldLibrary.xml          | 17 ++---
 .../my_description.xml                        |  4 +-
 .../my_destination_section_title.xml          | 10 +--
 .../my_destination_title.xml                  | 10 +--
 .../my_group_title_list.xml                   | 16 ++---
 .../my_int_index.xml                          |  2 +-
 .../my_outcome_description.xml                |  4 +-
 .../my_predecessor_title_list.xml             | 12 ++--
 .../ProjectLine_viewFieldLibrary/my_price.xml |  4 +-
 .../my_quantity.xml                           |  2 +-
 .../my_quantity_unit.xml                      |  4 +-
 .../my_reference.xml                          |  2 +-
 .../my_requirement_logical_path_list.xml      | 10 +--
 .../my_requirement_title.xml                  |  8 +--
 .../my_resource_title.xml                     | 10 +--
 .../my_source_title_list.xml                  | 10 +--
 .../my_source_trade_title_list.xml            |  8 +--
 .../my_start_date.xml                         |  2 +-
 .../my_start_date_range_max.xml               |  2 +-
 .../my_start_date_range_min.xml               |  2 +-
 .../my_stop_date.xml                          |  2 +-
 .../my_stop_date_range_max.xml                |  2 +-
 .../my_stop_date_range_min.xml                |  2 +-
 .../ProjectLine_viewInitialBudget.xml         |  7 +-
 .../erp5_project/ProjectLine_viewReport.xml   |  7 +-
 .../erp5_project/ProjectLine_viewTaskList.xml |  7 +-
 .../ProjectLine_viewTaskList/listbox.xml      | 18 ++---
 .../ProjectLine_viewTaskList/my_title.xml     |  2 +-
 .../ProjectModule_viewProjectList.xml         |  9 +--
 .../ProjectModule_viewProjectList/listbox.xml | 12 ++--
 .../listbox_start_date.xml                    |  2 +-
 .../listbox_stop_date.xml                     |  2 +-
 .../erp5_project/Project_addTask.xml          |  7 +-
 .../Project_generateQuantityReport.xml        |  7 +-
 .../Project_getDefaultReference.xml           |  7 +-
 .../Project_getReportSectionList.xml          |  7 +-
 .../Project_initializeFastInput.xml           |  7 +-
 .../erp5_project/Project_view.xml             |  7 +-
 .../erp5_project/Project_view/listbox.xml     | 16 ++---
 .../Project_view/listbox_quantity.xml         |  2 +-
 .../Project_viewDetailedReportAsOdt.xml       |  7 +-
 .../Project_viewDetailedReportDialog.xml      |  7 +-
 .../Project_viewDetailedReportMacro.xml       |  7 +-
 ...Project_viewDetailedReportOdtContainer.xml |  7 +-
 .../Project_viewDocumentList/my_title.xml     |  2 +-
 .../erp5_project/Project_viewFieldLibrary.xml | 17 ++---
 .../my_description.xml                        |  2 +-
 .../my_destination_decision_title.xml         |  8 +--
 .../my_destination_section_title.xml          |  8 +--
 .../my_destination_title.xml                  |  8 +--
 .../Project_viewFieldLibrary/my_reference.xml |  2 +-
 .../my_requirement_title.xml                  |  8 +--
 .../my_source_decision_title.xml              |  8 +--
 .../my_source_title_list.xml                  | 12 ++--
 .../my_start_date.xml                         |  2 +-
 .../Project_viewFieldLibrary/my_stop_date.xml |  2 +-
 .../Project_viewGlobalWorkListReport.xml      |  7 +-
 .../erp5_project/Project_viewMilestone.xml    |  7 +-
 .../Project_viewMilestone/listbox.xml         | 26 ++++----
 .../erp5_project/Project_viewPlanning.xml     |  7 +-
 .../Project_viewQuantityReport.xml            |  7 +-
 .../Project_viewSummaryList/listbox.xml       | 26 ++++----
 .../erp5_project/Project_viewTaskList.xml     |  7 +-
 .../Project_viewTaskList/listbox.xml          | 26 ++++----
 .../Project_viewTaskReportList/listbox.xml    | 26 ++++----
 ...quirementDocument_getOrderCoverageList.xml |  7 +-
 ...entDocument_getOrphanedRequirementList.xml |  7 +-
 ...Document_getOrphanedRequirementUidList.xml |  7 +-
 ...irementDocument_getProjectCoverageList.xml |  7 +-
 .../RequirementDocument_view/listbox.xml      | 38 +++++------
 .../RequirementDocument_view/my_reference.xml |  2 +-
 .../my_short_title.xml                        |  2 +-
 .../RequirementDocument_view/my_version.xml   |  2 +-
 ...rementDocument_viewDetailedReportAsOdt.xml |  7 +-
 ...ementDocument_viewDetailedReportDialog.xml |  7 +-
 ...ocument_viewDetailedReportOdtContainer.xml |  7 +-
 .../RequirementDocument_viewFieldLibrary.xml  | 17 ++---
 .../my_description.xml                        |  2 +-
 .../my_destination_decision_title.xml         |  8 +--
 .../my_reference.xml                          |  2 +-
 .../my_short_title.xml                        |  2 +-
 .../my_source_decision_title.xml              |  8 +--
 .../my_title.xml                              |  4 +-
 .../my_version.xml                            |  2 +-
 ...ntDocument_viewOrderMappingReportAsOdt.xml |  7 +-
 ...tDocument_viewOrderMappingReportDialog.xml |  7 +-
 ...ent_viewOrderMappingReportOdtContainer.xml |  7 +-
 ...RequirementDocument_viewOrphanedDialog.xml |  7 +-
 ...RequirementDocument_viewOrphanedReport.xml |  7 +-
 .../listbox.xml                               | 10 +--
 .../my_title.xml                              |  6 +-
 ...Document_viewProjectMappingReportAsOdt.xml |  7 +-
 ...ocument_viewProjectMappingReportDialog.xml |  7 +-
 ...t_viewProjectMappingReportOdtContainer.xml |  7 +-
 .../RequirementModule_viewRequirementList.xml |  7 +-
 .../listbox.xml                               | 10 +--
 .../Requirement_addDocumentFastInput.xml      |  7 +-
 .../Requirement_addRequirementsFastInput.xml  |  7 +-
 .../listbox.xml                               | 20 +++---
 .../erp5_project/Requirement_flatten_list.xml |  7 +-
 .../Requirement_generateRequirements.xml      |  7 +-
 .../Requirement_getDefaultReference.xml       |  7 +-
 .../erp5_project/Requirement_odt_style.xml    |  7 +-
 .../erp5_project/Requirement_odt_view.xml     |  7 +-
 .../erp5_project/Requirement_view.xml         |  7 +-
 .../erp5_project/Requirement_view/listbox.xml | 38 +++++------
 .../Requirement_view/my_reference.xml         |  2 +-
 .../Requirement_view/my_short_title.xml       |  2 +-
 .../Requirement_view/my_version.xml           |  2 +-
 .../Requirement_viewFieldLibrary.xml          | 17 ++---
 .../my_description.xml                        |  6 +-
 .../my_destination_decision_title.xml         |  8 +--
 .../my_initial_implementation_state.xml       |  4 +-
 .../my_reference.xml                          |  2 +-
 .../my_short_title.xml                        |  2 +-
 .../my_source_decision_title.xml              |  8 +--
 .../Requirement_viewFieldLibrary/my_title.xml |  4 +-
 .../my_translated_validation_state_title.xml  |  2 +-
 .../my_version.xml                            |  2 +-
 .../Requirement_viewProjectList.xml           |  7 +-
 .../Requirement_viewProjectList/listbox.xml   | 24 +++----
 .../my_reference.xml                          |  2 +-
 .../Requirement_viewProjectList/my_title.xml  |  4 +-
 ...ceTransaction_selectTaskReportMovement.xml |  7 +-
 .../erp5_project/TaskLine_view.xml            |  7 +-
 .../TaskLine_viewFieldLibrary.xml             | 17 ++---
 .../my_amortisation_method.xml                |  6 +-
 .../my_destination_title.xml                  |  8 +--
 .../TaskLine_viewFieldLibrary/my_price.xml    |  2 +-
 .../my_quantity_unit.xml                      |  4 +-
 .../my_requirement_logical_path_list.xml      | 10 +--
 .../my_resource_title.xml                     | 16 ++---
 .../my_source_project_title.xml               |  8 +--
 .../my_source_title.xml                       |  8 +--
 .../my_start_date.xml                         |  2 +-
 .../my_stop_date.xml                          |  2 +-
 .../my_total_price.xml                        |  4 +-
 .../my_total_quantity.xml                     |  4 +-
 .../my_variation_category_list.xml            |  8 +--
 .../TaskModule_generateDomain.xml             |  7 +-
 .../TaskModule_generatePersonDomain.xml       |  7 +-
 .../erp5_project/TaskModule_getTaskList.xml   |  7 +-
 .../TaskModule_viewPlanningReport.xml         |  7 +-
 .../erp5_project/TaskModule_viewTaskList.xml  |  9 +--
 .../TaskModule_viewTaskList/listbox.xml       | 24 +++----
 .../TaskReportLine_viewFieldLibrary.xml       | 17 ++---
 ...Module_exportTaskReportListAsiCalendar.xml |  7 +-
 .../TaskReportModule_generateDomain.xml       |  7 +-
 .../TaskReportModule_generatePersonDomain.xml |  7 +-
 ...TaskReportModule_generateProjectDomain.xml |  7 +-
 .../TaskReportModule_getTaskReportList.xml    |  7 +-
 .../TaskReportModule_viewPlanningReport.xml   |  7 +-
 .../TaskReportModule_viewTaskReportList.xml   |  9 +--
 .../listbox.xml                               | 24 +++----
 .../TaskReport_getSourceTaskReportList.xml    |  7 +-
 .../erp5_project/TaskReport_view/listbox.xml  | 12 ++--
 .../TaskReport_view/listbox_quantity_unit.xml |  2 +-
 .../TaskReport_viewDetailedReportAsOdt.xml    |  7 +-
 .../TaskReport_viewDetailedReportDialog.xml   |  7 +-
 .../TaskReport_viewFieldLibrary.xml           | 17 ++---
 .../my_comment.xml                            |  2 +-
 .../my_translated_causality_state_title.xml   |  2 +-
 .../erp5_project/TaskReport_viewItemList.xml  |  7 +-
 .../my_task_line_price.xml                    |  2 +-
 .../my_task_line_quantity.xml                 |  2 +-
 .../my_task_line_quantity_unit.xml            |  2 +-
 .../Task_calculateDuplication.xml             |  7 +-
 .../erp5_project/Task_duplicate.xml           |  7 +-
 ...skReportTranslatedSimulationStateTitle.xml |  7 +-
 .../portal_skins/erp5_project/Task_init.xml   |  7 +-
 .../erp5_project/Task_isSimpleTask.xml        |  7 +-
 .../erp5_project/Task_selectMovement.xml      |  7 +-
 .../erp5_project/Task_view/listbox.xml        | 12 ++--
 .../Task_view/listbox_quantity_unit.xml       |  2 +-
 .../Task_view/my_source_title.xml             |  2 +-
 .../erp5_project/Task_viewConstraint.xml      |  7 +-
 .../Task_viewConstraint/my_title.xml          |  2 +-
 .../erp5_project/Task_viewDuplicateDialog.xml |  7 +-
 .../Task_viewDuplicateDialog/my_title.xml     |  2 +-
 .../erp5_project/Task_viewFieldLibrary.xml    | 17 ++---
 .../my_destination_administration_title.xml   |  8 +--
 .../my_destination_decision_title.xml         | 10 +--
 .../my_destination_payment_title.xml          |  8 +--
 .../my_destination_section_title.xml          |  8 +--
 .../my_source_administration_title.xml        |  8 +--
 .../my_source_decision_title.xml              |  8 +--
 .../my_source_payment_title.xml               |  8 +--
 .../my_source_section_title.xml               | 10 +--
 ...ask_line_requirement_logical_path_list.xml | 16 ++---
 .../erp5_project/Task_viewProfile.xml         |  7 +-
 .../erp5_project/Task_zSelectMovement.xml     | 13 ++--
 .../portal_skins/erp5_project_trade.xml       |  7 +-
 .../BaseTradeProject_FieldLibrary.xml         |  7 +-
 .../OrderMilestone_view.xml                   |  7 +-
 .../SaleOrder_viewDetailedReportAsOdt.xml     |  7 +-
 .../SaleOrder_viewDetailedReportDialog.xml    |  7 +-
 .../SaleOrder_viewDetailedReportMacro.xml     |  7 +-
 ...leOrder_viewDetailedReportOdtContainer.xml |  7 +-
 .../SaleOrder_viewMilestone.xml               |  7 +-
 .../TradeLine_viewProfile.xml                 |  7 +-
 .../TradeLine_viewProject.xml                 |  7 +-
 .../project_workflow/scripts.xml              |  7 +-
 .../project_workflow/states.xml               |  7 +-
 .../project_workflow/transitions.xml          |  7 +-
 .../project_workflow/transitions/delete.xml   |  7 +-
 .../transitions/delete_action.xml             |  7 +-
 .../transitions/invalidate.xml                |  7 +-
 .../transitions/invalidate_action.xml         |  7 +-
 .../project_workflow/transitions/suspend.xml  |  7 +-
 .../project_workflow/transitions/validate.xml |  7 +-
 .../transitions/validate_action.xml           |  7 +-
 .../project_workflow/variables.xml            |  7 +-
 .../project_workflow/variables/action.xml     |  7 +-
 .../project_workflow/variables/actor.xml      |  7 +-
 .../project_workflow/variables/comment.xml    |  7 +-
 .../variables/error_message.xml               |  7 +-
 .../project_workflow/variables/history.xml    |  7 +-
 .../variables/portal_type.xml                 |  7 +-
 .../project_workflow/variables/time.xml       |  7 +-
 .../requirement_analysis_workflow.xml         |  7 +-
 .../requirement_analysis_workflow/scripts.xml |  7 +-
 .../requirement_analysis_workflow/states.xml  |  7 +-
 .../states/cancelled.xml                      |  7 +-
 .../states/confirmed.xml                      |  7 +-
 .../states/delivered.xml                      |  7 +-
 .../states/draft.xml                          |  7 +-
 .../states/planned.xml                        |  7 +-
 .../states/started.xml                        |  7 +-
 .../states/stopped.xml                        |  7 +-
 .../transitions.xml                           |  7 +-
 .../transitions/cancel.xml                    |  7 +-
 .../transitions/cancel_action.xml             |  7 +-
 .../transitions/confirm.xml                   |  7 +-
 .../transitions/confirm_action.xml            |  7 +-
 .../transitions/deliver.xml                   |  7 +-
 .../transitions/deliver_action.xml            |  7 +-
 .../transitions/plan.xml                      |  7 +-
 .../transitions/plan_action.xml               |  7 +-
 .../transitions/start.xml                     |  7 +-
 .../transitions/start_action.xml              |  7 +-
 .../transitions/stop.xml                      |  7 +-
 .../transitions/stop_action.xml               |  7 +-
 .../variables.xml                             |  7 +-
 .../variables/action.xml                      |  7 +-
 .../variables/actor.xml                       |  7 +-
 .../variables/comment.xml                     |  7 +-
 .../variables/history.xml                     |  7 +-
 .../variables/time.xml                        |  7 +-
 .../worklists.xml                             |  7 +-
 .../task_report_causality_workflow.xml        |  7 +-
 .../scripts.xml                               |  7 +-
 .../scripts/PackingList_acceptDecision.xml    |  7 +-
 .../scripts/PackingList_adoptPrevision.xml    |  7 +-
 .../scripts/PackingList_calculate.xml         |  7 +-
 ...ckingList_callSplitPrevisionTransition.xml |  7 +-
 .../scripts/PackingList_split.xml             |  7 +-
 .../task_report_causality_workflow/states.xml |  7 +-
 .../states/building.xml                       |  7 +-
 .../states/calculating.xml                    |  7 +-
 .../states/diverged.xml                       |  7 +-
 .../states/draft.xml                          |  7 +-
 .../states/solved.xml                         |  7 +-
 .../states/solving.xml                        |  7 +-
 .../transitions.xml                           |  7 +-
 .../transitions/accept_decision.xml           |  7 +-
 .../transitions/accept_decision_action.xml    |  7 +-
 .../transitions/adopt_prevision.xml           |  7 +-
 .../transitions/adopt_prevision_action.xml    |  7 +-
 .../transitions/calculate.xml                 |  7 +-
 .../transitions/converge.xml                  |  7 +-
 .../transitions/diverge.xml                   |  7 +-
 .../transitions/split_prevision.xml           |  7 +-
 .../transitions/split_prevision_action.xml    |  7 +-
 .../transitions/start_building.xml            |  7 +-
 .../variables.xml                             |  7 +-
 .../variables/action.xml                      |  7 +-
 .../variables/actor.xml                       |  7 +-
 .../variables/comment.xml                     |  7 +-
 .../variables/history.xml                     |  7 +-
 .../variables/portal_type.xml                 |  7 +-
 .../variables/time.xml                        |  7 +-
 .../worklists.xml                             |  7 +-
 bt5/erp5_project/bt/revision                  |  2 +-
 401 files changed, 1284 insertions(+), 2436 deletions(-)

diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/view.xml
index 3430def850..74f2cf5a77 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Cell/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml
index 65ec17546a..d3d72fdf0c 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/add_task_related.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/available_budget.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/available_budget.xml
index 993eb4bd78..cb3d923833 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/available_budget.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/available_budget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
index a19da52074..152955ba88 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/constraint.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/consumed_budget.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/consumed_budget.xml
index 64ccf8cc24..5f7e80fcc8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/consumed_budget.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/consumed_budget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/contents.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/contents.xml
index 3241c19f56..8a5eff6ddb 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/contents.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/contents.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/current_budget.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/current_budget.xml
index 481ec01a75..40a9755621 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/current_budget.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/current_budget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/documents.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/documents.xml
index 5e91e5424d..1c3eaf28a2 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/documents.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/documents.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/files.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/files.xml
index 72791b9927..4a2f7da066 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/files.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/files.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/initial_budget.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/initial_budget.xml
index e92be6ac77..3f0196d590 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/initial_budget.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/initial_budget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/jump_to_related_sale_order_lines.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/jump_to_related_sale_order_lines.xml
index 3c33ee04f0..727cb565ce 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/jump_to_related_sale_order_lines.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/jump_to_related_sale_order_lines.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
index 08f34d96ad..2dcaf60395 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/task_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/view.xml
index a12fd13cbc..e1b0a7301b 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/constraint.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/constraint.xml
index b7e78be2c4..513823073f 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/constraint.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/constraint.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/view.xml
index a12fd13cbc..e1b0a7301b 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Milestone/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/view.xml
index b97563f394..2542eb91eb 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml
index 2f5e1022d3..6641a03d07 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/add_task_related.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/content.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/content.xml
index 24310045a3..c38e6d741d 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/content.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/content.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/detailed_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/detailed_report.xml
index b248eab8cd..971b9928c0 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/detailed_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/detailed_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/documents.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/documents.xml
index 822a99933e..ec8703fe6a 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/documents.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/documents.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/files.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/files.xml
index 827b3afd47..97bdc5a104 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/files.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/files.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/jump_to_related_sale_order_lines.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/jump_to_related_sale_order_lines.xml
index 3c33ee04f0..727cb565ce 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/jump_to_related_sale_order_lines.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/jump_to_related_sale_order_lines.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/milestone.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/milestone.xml
index 33828b453c..2d565dfa5b 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/milestone.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/milestone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/planning.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/planning.xml
index 29be4e97f6..9a6f758d8c 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/planning.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/planning.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_lines.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_lines.xml
index 071320ce24..78772e6953 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_lines.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/project_lines.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/report.xml
index b0b5d71fd9..b7adcdd6da 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
index c4894c161d..68cdede290 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/task_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/view.xml
index 19de3d3359..b4859a14de 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Project/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Project/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/detailed_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/detailed_report.xml
index c6faedd9a8..b5be19d643 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/detailed_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/detailed_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/orphaned.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/orphaned.xml
index 8a55ca1f58..c5e4fd458c 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/orphaned.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/orphaned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/project_mapping.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/project_mapping.xml
index 0dbdffa36c..2e1a4d617c 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/project_mapping.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/project_mapping.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/view.xml
index 085d71eb2d..7124374762 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Document/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/fast_input.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/fast_input.xml
index d1c58d6936..918a204402 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/fast_input.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/fast_input.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/view.xml
index 59cf58ab01..5bfa81f7fe 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/project_list.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/project_list.xml
index cc9d829d93..eec185e74e 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/project_list.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/project_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/view.xml
index a54268487c..b2e4220439 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Requirement/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/line_profile.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/line_profile.xml
index 4f3dd379bf..b458e4ece8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/line_profile.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/line_profile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/project.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/project.xml
index 9ec1a87452..aebb0ebcc8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/project.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Line/project.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/line_profile.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/line_profile.xml
index a1ca7a1ad0..1b6928b8bc 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/line_profile.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/line_profile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/project.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/project.xml
index 9ec1a87452..aebb0ebcc8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/project.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/project.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/view.xml
index 8d0d504674..268a8f38b5 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order%20Milestone/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/detailed_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/detailed_report.xml
index fbf2408256..9afd1d3083 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/detailed_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/detailed_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/milestone_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/milestone_view.xml
index 284b0cfec0..cfde45e686 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/milestone_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Order/milestone_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/line_profile.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/line_profile.xml
index 4f3dd379bf..b458e4ece8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/line_profile.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/line_profile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/project.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/project.xml
index 9ec1a87452..aebb0ebcc8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/project.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/project.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/price_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/price_view.xml
index 2f52fa6256..cc2e9d15d1 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/price_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/price_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/quantity_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/quantity_view.xml
index 42d7040078..bbf4784a6d 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/quantity_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml
index afa708a186..15551117d7 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/planning_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/planning_report.xml
index decc725df5..1eafd001b5 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/planning_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/planning_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/view.xml
index 73c51a8df8..e1b3c3d0b7 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/workflow_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/workflow_report.xml
index 9a0c191ba8..33755b8480 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/workflow_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Module/workflow_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml
index 2f52fa6256..cc2e9d15d1 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml
index 42d7040078..bbf4784a6d 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml
index afa708a186..15551117d7 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/icalendar_export.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/icalendar_export.xml
index 43e659e363..b7a883ff0a 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/icalendar_export.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/icalendar_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/planning_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/planning_report.xml
index 662a0d28cc..e61bd66dc1 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/planning_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/planning_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/view.xml
index d9a9fcfeb7..f5beed6668 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/workflow_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/workflow_report.xml
index 9a0c191ba8..33755b8480 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/workflow_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Module/workflow_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/expense_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/expense_view.xml
index 229148a0af..be449c8387 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/expense_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/expense_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_task.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_task.xml
index f16431105a..62d166e877 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_task.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_task.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml
index b0f9045a41..9f641f87e2 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml
index 44fb6108c6..abd68cea71 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml
index 9d2a74d3c6..a2ab5b563a 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml
index 51c1e04676..32d6da365d 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml
index 39255398e1..9e929f084f 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/apply_trade_condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/constraint.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/constraint.xml
index 45434aa208..3d57518dc5 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/constraint.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/constraint.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/duplicate_task.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/duplicate_task.xml
index ed4eea18e6..c84e038598 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/duplicate_task.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/duplicate_task.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml
index 4c787d27ea..ee51908653 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/jump_to_related_task_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/payment_condition.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/payment_condition.xml
index 42a1e682c9..ae32b6fcf8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/payment_condition.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/payment_condition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml
index 0e52e79154..fea64c2b8c 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view.xml
index d369fe909e..86b96c25e8 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view_discount.xml b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view_discount.xml
index 50405be293..12a1fb9496 100644
--- a/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view_discount.xml
+++ b/bt5/erp5_project/ActionTemplateItem/portal_types/Task/view_discount.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml b/bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml
index 5c1c9ad2c9..b579ccd20a 100644
--- a/bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml
+++ b/bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml b/bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml
index f9a6ab12a7..69a1f96310 100644
--- a/bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml
+++ b/bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
index b180ae6302..dc77ab5d51 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
index 9ee6ab6ad7..fc155b4bb2 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.DeliveryBuilder</string>
-          <string>DeliveryBuilder</string>
-        </tuple>
-        <none/>
+        <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_domain.xml b/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_domain.xml
index 3141d895fb..316d2bcb06 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_domain.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_domain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseDomain</string>
-          <string>BaseDomain</string>
-        </tuple>
-        <none/>
+        <global name="BaseDomain" module="Products.ERP5Type.Document.BaseDomain"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -68,7 +65,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>6</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_person_domain.xml b/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_person_domain.xml
index b30a64a14d..1a0c2cb098 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_person_domain.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_domains/task_module_person_domain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseDomain</string>
-          <string>BaseDomain</string>
-        </tuple>
-        <none/>
+        <global name="BaseDomain" module="Products.ERP5Type.Document.BaseDomain"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_domain.xml b/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_domain.xml
index 7d41e7ac7d..1214d40894 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_domain.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_domain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseDomain</string>
-          <string>BaseDomain</string>
-        </tuple>
-        <none/>
+        <global name="BaseDomain" module="Products.ERP5Type.Document.BaseDomain"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_person_domain.xml b/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_person_domain.xml
index 4414b99cd1..57b3a8e104 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_person_domain.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_domains/task_report_module_person_domain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseDomain</string>
-          <string>BaseDomain</string>
-        </tuple>
-        <none/>
+        <global name="BaseDomain" module="Products.ERP5Type.Document.BaseDomain"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Cell.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Cell.xml
index 899654e6f8..dc0c5e3e74 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Cell.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Cell.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Line.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Line.xml
index b3f7fdef4f..6c8bd46d23 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Line.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Milestone.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Milestone.xml
index 8b57ac4d5d..47ac10a22f 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Milestone.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Milestone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Module.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Module.xml
index ad08f789f3..0a6427cc2c 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Module.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Project%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement%20Module.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement%20Module.xml
index 9f56721fbd..9f39d96c01 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement%20Module.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement.xml
index 8fda28fd11..328527b6d4 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Requirement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Sale%20Order%20Milestone.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Sale%20Order%20Milestone.xml
index becccbf95b..d4a093fe3d 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Sale%20Order%20Milestone.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Sale%20Order%20Milestone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml
index 28db2040d8..7a16c7e1e9 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Module.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Module.xml
index 4a49feda84..37dd181aa9 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Module.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml
index 33e4033104..fa0f8004c2 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Module.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Module.xml
index 526e2e3c69..93f5ae9225 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Module.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml
index d008ae9a9e..08c369a2ed 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
index 3a8728f4c7..5eeb186cd1 100644
--- a/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
+++ b/bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -36,6 +33,25 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
@@ -117,4 +133,44 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project.xml
index eee0f3fbef..c2500bc47e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseLine_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseLine_view.xml
index 090f884f26..a23d0dcd41 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseLine_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList.xml
index 946ddca061..f6925fd55e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view.xml
index e4373c4e95..24028b7838 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Movement_getSimulationStateColorText.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Movement_getSimulationStateColorText.xml
index 86f460c335..d5e64f790a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Movement_getSimulationStateColorText.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Movement_getSimulationStateColorText.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput.xml
index 882a6353ca..c92e94ac09 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_generateTasks.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_generateTasks.xml
index c114dd8027..382501cc4c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_generateTasks.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_generateTasks.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getAggregatedQuantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getAggregatedQuantity.xml
index 0ec338a3bc..dc65ae416d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getAggregatedQuantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getAggregatedQuantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -126,6 +123,7 @@ return context.getQuantity()\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>p</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getRequirimentStringList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getRequirimentStringList.xml
index 0725e0784d..b6e8b06e9b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getRequirimentStringList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getRequirimentStringList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getWorkList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getWorkList.xml
index 6e9eaa6860..e7406af0fc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getWorkList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_getWorkList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view.xml
index 8c7328cc72..d52df2f052 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox.xml
index f30ae3fb3b..b6ddfd996e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox.xml
@@ -101,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -113,7 +113,7 @@
                     <value> <string>Project_view</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_selection</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox_quantity.xml
index 9a4cfea8a6..2b035b345c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/listbox_quantity.xml
@@ -59,7 +59,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -82,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_int_index.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_int_index.xml
index 9663831b36..f336b001dc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_int_index.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_int_index.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_quantity.xml
index b43002f610..10cd7ffbd2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_view/my_quantity.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget.xml
index a266bfcc2e..faaeb7fa84 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget/my_resource_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget/my_resource_title.xml
index 0677bd6ea9..41c3dfc454 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget/my_resource_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewAvailableBudget/my_resource_title.xml
@@ -86,7 +86,7 @@
                     <value> <string>ProjectLine_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint.xml
index 26fa1250f6..e4d27579b7 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint/my_title.xml
index 5e8d37a041..c8267817b5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConstraint/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget.xml
index a7782c6f0d..6026225364 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget/my_resource_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget/my_resource_title.xml
index 0677bd6ea9..41c3dfc454 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget/my_resource_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewConsumedBudget/my_resource_title.xml
@@ -86,7 +86,7 @@
                     <value> <string>ProjectLine_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewCurrentBudget.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewCurrentBudget.xml
index 8296f6e444..e5b6271051 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewCurrentBudget.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewCurrentBudget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList.xml
index e73cf4d230..817be90849 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -78,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -86,7 +83,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -94,13 +91,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_title</string>
@@ -113,7 +110,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_start_date</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/listbox.xml
index 59025df4f6..128ca93a6b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/listbox.xml
@@ -75,7 +75,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -119,7 +119,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -158,7 +158,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>default_params</string> </key>
+                    <key> <string>default_params</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -177,19 +177,19 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -200,15 +200,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_line_document_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -223,7 +223,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Documents</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/my_description.xml
index 30ce735709..d357ea65dc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewDocumentList/my_description.xml
@@ -86,7 +86,7 @@
                     <value> <string>ProjectLine_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>height</string> </key>
+                    <key> <string>height</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary.xml
index bddd48ab8a..3d9cce7159 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -122,7 +119,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_description.xml
index 2e42a4cb5c..c5483946c4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_description.xml
@@ -87,7 +87,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>height</string> </key>
+                    <key> <string>height</string> </key>
                     <value> <int>4</int> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_section_title.xml
index 93f6a9d0a7..f1e3f44b6a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_section_title.xml
@@ -82,15 +82,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_section</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>organisation</string> </value>
                 </item>
                 <item>
@@ -102,7 +102,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -125,7 +125,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Destination Section</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_title.xml
index 6662754b8f..2e25be7646 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_destination_title.xml
@@ -82,15 +82,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>organisation</string> </value>
                 </item>
                 <item>
@@ -102,7 +102,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Location</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_group_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_group_title_list.xml
index 6959408213..f4598c4127 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_group_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_group_title_list.xml
@@ -74,7 +74,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <none/>
                     </value>
@@ -91,19 +91,19 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>group</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>transformation_module</string> </value>
                 </item>
                 <item>
@@ -115,7 +115,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -134,11 +134,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Group</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value> <int>30</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_int_index.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_int_index.xml
index ffccf47d1e..cf54efccde 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_int_index.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Int Index</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_outcome_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_outcome_description.xml
index e2e6beabb0..c9f1ccffb4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_outcome_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_outcome_description.xml
@@ -91,11 +91,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Outcome</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_predecessor_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_predecessor_title_list.xml
index 562eb85c30..cb65e2ac9d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_predecessor_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_predecessor_title_list.xml
@@ -89,15 +89,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>predecessor</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>task_module</string> </value>
                 </item>
                 <item>
@@ -109,11 +109,11 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>height</string> </key>
+                    <key> <string>height</string> </key>
                     <value> <int>4</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -128,7 +128,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Predecessors</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_price.xml
index 33d9a4a19f..34064af32e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_price.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Rate</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity.xml
index 79e1e90ad8..a1b621bfaa 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity.xml
@@ -59,7 +59,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
index 673407b0ac..3408b8543b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
@@ -68,7 +68,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -97,7 +97,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Unit</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_reference.xml
index f4ead0b143..7f1953e4cb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_reference.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
index acdcdb79a4..df61bce20a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
@@ -88,11 +88,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -108,7 +108,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -123,11 +123,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirements</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value> <int>80</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_title.xml
index a695ab5bc7..a462d637a1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirement Document</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_resource_title.xml
index eb3c2c57de..c0f8cd9736 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_resource_title.xml
@@ -94,11 +94,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>resource</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -114,13 +114,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -135,7 +135,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Resource</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_title_list.xml
index 0d0acfbf9b..31fe3f207d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_title_list.xml
@@ -82,15 +82,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>person</string> </value>
                 </item>
                 <item>
@@ -102,7 +102,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Resources</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_trade_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_trade_title_list.xml
index 51f7b1fbad..d738c48869 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_trade_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_source_trade_title_list.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_trade</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -116,7 +116,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Resources</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date.xml
index af8f80219b..b0bdc4958b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Begin Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_max.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_max.xml
index 84565be40f..a0e298e00d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_max.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_max.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Start Before</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_min.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_min.xml
index 7b7f94e750..aa9166adf1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_min.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_start_date_range_min.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Start After</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date.xml
index e4d73c9138..9b1f284383 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>End Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_max.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_max.xml
index bee6b83dae..19a7f0fbee 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_max.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_max.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Stop Before</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_min.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_min.xml
index bd4181a39a..2195508240 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_min.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_stop_date_range_min.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Stop After</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewInitialBudget.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewInitialBudget.xml
index f9a8795eac..30ac165045 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewInitialBudget.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewInitialBudget.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport.xml
index 89c2997501..5a7d7f6b56 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
index 7c1cd9dd2e..a632027be1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
index 1408c028aa..4157dd6fee 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
@@ -90,7 +90,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -148,7 +148,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -195,13 +195,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -212,7 +212,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -223,15 +223,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_task_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -246,7 +246,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Tasks</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/my_title.xml
index 5e8d37a041..c8267817b5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList.xml
index 79b2c562c4..2438e9a2b3 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,7 +76,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_start_date</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox.xml
index 12105ee431..a4b653ddec 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox.xml
@@ -87,7 +87,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -120,7 +120,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -147,7 +147,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -170,7 +170,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -181,7 +181,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_module_selection</string> </value>
                 </item>
                 <item>
@@ -189,7 +189,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Projects</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_start_date.xml
index 3de65a6864..6fe05dcde3 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_start_date.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_stop_date.xml
index 138b8a4ab0..d002b887d5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewProjectList/listbox_stop_date.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
index 5db5279fb5..a4ec21ccd9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_addTask.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateQuantityReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateQuantityReport.xml
index be880e0b4c..df5b76c5cc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateQuantityReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateQuantityReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getDefaultReference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getDefaultReference.xml
index 58f535e725..91fbd61d07 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getDefaultReference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getDefaultReference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getReportSectionList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getReportSectionList.xml
index ba90a33d8e..3fdca390cc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getReportSectionList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getReportSectionList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml
index 7bc24b7f03..8861f5e9fd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_initializeFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view.xml
index e92eff7935..4f7fd4c261 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox.xml
index bce064eaa6..5fe8ed4197 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox.xml
@@ -112,7 +112,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -151,7 +151,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -178,7 +178,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -189,7 +189,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -200,15 +200,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -223,7 +223,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Project Lines</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox_quantity.xml
index da870b65f6..13ca53ed5a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_view/listbox_quantity.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml
index 5c257501f5..599855a7e4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportDialog.xml
index 790c3e2ef9..8b669a85e8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
index 70231c6918..f6eecfad7f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportOdtContainer.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportOdtContainer.xml
index 8cc6ad973e..630a83aeaf 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportOdtContainer.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportOdtContainer.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDocumentList/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDocumentList/my_title.xml
index d9fa0d46c4..8ba7822bd4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDocumentList/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDocumentList/my_title.xml
@@ -115,7 +115,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary.xml
index 2c2bc638e9..6c693dc9a1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -112,7 +109,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_description.xml
index 252ab37f3f..23e6cb2a75 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_description.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_decision_title.xml
index d2eace2305..92282bc32b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_decision_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requested by</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_section_title.xml
index 8da684d9a0..97b5befccb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_section_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_section</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -120,7 +120,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Billable Client</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_title.xml
index ad48fbee78..8c4ad12f05 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_destination_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -120,7 +120,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Project Location</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_reference.xml
index f4ead0b143..7f1953e4cb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_reference.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_requirement_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_requirement_title.xml
index a695ab5bc7..a462d637a1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_requirement_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_requirement_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirement Document</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_decision_title.xml
index feb88172bd..b96715a0a9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_decision_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -113,7 +113,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Supervisor</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_title_list.xml
index ceb505e3ad..27e1aa7064 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_source_title_list.xml
@@ -72,7 +72,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <none/>
                     </value>
@@ -89,15 +89,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_module</string> </key>
+                    <key> <string>default_module</string> </key>
                     <value> <string>person</string> </value>
                 </item>
                 <item>
@@ -109,7 +109,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -124,7 +124,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Resources</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_start_date.xml
index af8f80219b..b0bdc4958b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_start_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Begin Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_stop_date.xml
index e4d73c9138..9b1f284383 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewFieldLibrary/my_stop_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>End Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewGlobalWorkListReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewGlobalWorkListReport.xml
index a94f906317..18f61958cc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewGlobalWorkListReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewGlobalWorkListReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Report</string>
-          <string>ERP5Report</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Report" module="Products.ERP5Form.Report"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml
index add2604f7c..a22fe876fc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
index 68201d6326..20267b038e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
@@ -90,11 +90,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Base_viewSearchResultList</string> </key>
+                    <key> <string>Base_viewSearchResultList</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -140,7 +140,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -163,7 +163,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -190,15 +190,15 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Project_viewLineList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -213,7 +213,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -224,15 +224,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_milestone_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -247,7 +247,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Project Milestones</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning.xml
index 0ac977d10b..2b916ca209 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewQuantityReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewQuantityReport.xml
index 44135e1123..8c68c83d5d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewQuantityReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewQuantityReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
index d04476f829..e3db31e9f7 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
@@ -91,7 +91,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -177,7 +177,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -240,7 +240,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -271,21 +271,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Project_viewLineList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -296,7 +296,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -307,11 +307,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_task_report_selection</string> </value>
                 </item>
                 <item>
@@ -319,7 +319,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -330,7 +330,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>stat_method</string> </key>
+                    <key> <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -340,7 +340,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Listbox</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList.xml
index cd1eb21917..04944934c9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
index d36555d998..61c1cef710 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
@@ -91,7 +91,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -165,7 +165,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -216,7 +216,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -247,21 +247,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Project_viewLineList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -272,7 +272,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -283,11 +283,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_task_selection</string> </value>
                 </item>
                 <item>
@@ -295,7 +295,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -306,7 +306,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>stat_method</string> </key>
+                    <key> <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -316,7 +316,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Listbox</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
index 3f3ec1159a..228c658653 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
@@ -91,7 +91,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -165,7 +165,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -216,7 +216,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -247,21 +247,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Project_viewLineList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -272,7 +272,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -283,11 +283,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>project_task_report_selection</string> </value>
                 </item>
                 <item>
@@ -295,7 +295,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -306,7 +306,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>stat_method</string> </key>
+                    <key> <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -316,7 +316,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Listbox</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrderCoverageList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrderCoverageList.xml
index 9a1dc746bc..da1b310450 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrderCoverageList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrderCoverageList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementList.xml
index a6ee2cb044..b51a8488c9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementUidList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementUidList.xml
index 55236b253b..7a938785fb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementUidList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getOrphanedRequirementUidList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
index df7cedd71b..b248840db4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/listbox.xml
index 68b69a23ee..7f0de009e6 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/listbox.xml
@@ -96,17 +96,17 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Base_viewSearchResultList</string> </key>
+                    <key> <string>Base_viewSearchResultList</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -137,11 +137,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>List and details of requirements.</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -160,13 +160,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_permission</string> </key>
+                    <key> <string>editable_permission</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_role</string> </key>
+                    <key> <string>editable_role</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -180,25 +180,25 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>200</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Folder_viewContentList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>not_viewable</string> </key>
+                    <key> <string>not_viewable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -209,15 +209,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>read_only</string> </key>
+                    <key> <string>read_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>sub_requirement_list_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -236,7 +236,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -267,17 +267,17 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirements</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>viewable_permission</string> </key>
+                    <key> <string>viewable_permission</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>viewable_role</string> </key>
+                    <key> <string>viewable_role</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_reference.xml
index e557d35567..6b8a4ecd4b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_reference.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_short_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_short_title.xml
index f06798826a..9d0a6cd715 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_short_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_short_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_version.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_version.xml
index db94a3e74d..bcc0707ccb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_version.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_view/my_version.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml
index 3c0ba8b2d7..b89d76e9f1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportDialog.xml
index f1d3498571..5feec084e6 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportOdtContainer.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportOdtContainer.xml
index b2dc7e3420..24743a038b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportOdtContainer.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportOdtContainer.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary.xml
index 47f07ef574..d7a75ea521 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -106,7 +103,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_description.xml
index 252ab37f3f..23e6cb2a75 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_description.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_destination_decision_title.xml
index 3c3a4b0a28..ef1533bea8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_destination_decision_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>Destination_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Destination Decision</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_reference.xml
index f4ead0b143..7f1953e4cb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_reference.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_short_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_short_title.xml
index a5605cd254..78862acae2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_short_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_short_title.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Short Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_source_decision_title.xml
index eca27421e9..87a715732b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_source_decision_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Source Decision</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_title.xml
index 99aa612720..e70c196620 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>40</int> </value>
                 </item>
                 <item>
@@ -91,7 +91,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_version.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_version.xml
index d9f2113c6d..8b91d4708b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_version.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewFieldLibrary/my_version.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Version</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml
index d5a1bc4e49..d765265d3d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportDialog.xml
index e657d3494c..2feb16448c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportOdtContainer.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportOdtContainer.xml
index 02e40bd539..c561ee01da 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportOdtContainer.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportOdtContainer.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedDialog.xml
index a401f230e8..554c3aa221 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport.xml
index 8c0d5a7706..c5a7ad5cdf 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
index 646777f767..932c6ca528 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
@@ -82,13 +82,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -115,13 +115,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>orphaned_requirement_selection</string> </value>
                 </item>
                 <item>
@@ -129,7 +129,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Listbox</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/my_title.xml
index d83d3c186b..96b54840ff 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/my_title.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -96,7 +96,7 @@
                     <value> <string>RequirementDocument_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml
index e78911c8ca..245157481c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportDialog.xml
index 6bb7053dba..b01e0dca00 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportOdtContainer.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportOdtContainer.xml
index 8568534905..783bf18e4f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportOdtContainer.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportOdtContainer.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList.xml
index 748911409c..ba46abe5a3 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList/listbox.xml
index 8a0f7b3c7e..803359ba4f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementModule_viewRequirementList/listbox.xml
@@ -92,7 +92,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -111,7 +111,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -149,7 +149,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -164,7 +164,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>requirement_document_list_selection</string> </value>
                 </item>
                 <item>
@@ -172,7 +172,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirement Documents</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
index ba7265b4d4..46092f508d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput.xml
index b11b0f0bae..5cd352ecfd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput/listbox.xml
index da0d375ec6..e84e96ccff 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addRequirementsFastInput/listbox.xml
@@ -87,11 +87,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Base_viewSearchResultList</string> </key>
+                    <key> <string>Base_viewSearchResultList</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -110,7 +110,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -129,7 +129,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -148,7 +148,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -175,21 +175,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>100</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>requirement_fast_input</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -208,7 +208,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirements</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_flatten_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_flatten_list.xml
index f8458bb2f8..c7f71e0ab1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_flatten_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_flatten_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.xml
index 63c892b367..5822c12cf0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_generateRequirements.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_getDefaultReference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_getDefaultReference.xml
index 25e054fa17..859590ed3a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_getDefaultReference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_getDefaultReference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_style.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_style.xml
index a308c7ae41..f5404fe6a4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_style.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_style.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml
index 82bd2b5498..7a65764d9b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
index e1b92e080d..b65c9c0afe 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/listbox.xml
index 7bc49e9a8c..e3c0b2e61f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/listbox.xml
@@ -102,17 +102,17 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Base_viewSearchResultList</string> </key>
+                    <key> <string>Base_viewSearchResultList</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -143,11 +143,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>List and details of sub-requirements.</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -166,13 +166,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_permission</string> </key>
+                    <key> <string>editable_permission</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_role</string> </key>
+                    <key> <string>editable_role</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -186,25 +186,25 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>200</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Folder_viewContentList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>not_viewable</string> </key>
+                    <key> <string>not_viewable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -215,15 +215,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>read_only</string> </key>
+                    <key> <string>read_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>sub_requirement_list_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -238,7 +238,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -265,17 +265,17 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Sub-Requirements</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>viewable_permission</string> </key>
+                    <key> <string>viewable_permission</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>viewable_role</string> </key>
+                    <key> <string>viewable_role</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_reference.xml
index ba862722d2..1b73152d3e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_reference.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_short_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_short_title.xml
index 90df3d6856..fbf7bdae22 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_short_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_short_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_version.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_version.xml
index 1d37dc046f..278d815444 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_version.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_version.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary.xml
index a714be6936..22d41acbfd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -108,7 +105,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_description.xml
index 007c21b66c..748cb21af8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_description.xml
@@ -88,7 +88,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>height</string> </key>
+                    <key> <string>height</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
@@ -96,11 +96,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value> <int>100</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_destination_decision_title.xml
index 3c3a4b0a28..ef1533bea8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_destination_decision_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>Destination_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Destination Decision</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_initial_implementation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_initial_implementation_state.xml
index e43f19c7c2..21f1ae34c6 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_initial_implementation_state.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_initial_implementation_state.xml
@@ -87,7 +87,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -118,7 +118,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Implementation State</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_reference.xml
index f4ead0b143..7f1953e4cb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_reference.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_short_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_short_title.xml
index a5605cd254..78862acae2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_short_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_short_title.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Short Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_source_decision_title.xml
index eca27421e9..87a715732b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_source_decision_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Source Decision</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_title.xml
index 99aa612720..e70c196620 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>40</int> </value>
                 </item>
                 <item>
@@ -91,7 +91,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_translated_validation_state_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_translated_validation_state_title.xml
index 52bb1eb0eb..a3573dd5b4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_translated_validation_state_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_translated_validation_state_title.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirement State</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_version.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_version.xml
index d9f2113c6d..8b91d4708b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_version.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewFieldLibrary/my_version.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Version</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList.xml
index 13f779adcf..5d50baf701 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/listbox.xml
index ae71146383..3f82be7f16 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/listbox.xml
@@ -89,11 +89,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>Base_viewSearchResultList</string> </key>
+                    <key> <string>Base_viewSearchResultList</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -116,7 +116,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -147,21 +147,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Folder_viewContentList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -176,7 +176,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -187,15 +187,15 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>requirement_project_0_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -210,7 +210,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Listbox</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_reference.xml
index ba862722d2..1b73152d3e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_reference.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_title.xml
index 3d3f222bf8..bf0934a016 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_viewProjectList/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -91,7 +91,7 @@
                     <value> <string>Requirement_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/SaleInvoiceTransaction_selectTaskReportMovement.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/SaleInvoiceTransaction_selectTaskReportMovement.xml
index 536fafa77b..eb066249c8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/SaleInvoiceTransaction_selectTaskReportMovement.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/SaleInvoiceTransaction_selectTaskReportMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_view.xml
index 7f2e48772a..96a6bbfedf 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary.xml
index 077d274639..13dda8b5f0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_title</string>
@@ -115,7 +112,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_amortisation_method.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_amortisation_method.xml
index 1a9a4cb84d..8506c49d86 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_amortisation_method.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_amortisation_method.xml
@@ -61,7 +61,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -75,7 +75,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -104,7 +104,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Amortisation Method</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_destination_title.xml
index 033ea021e9..fa06efca08 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_destination_title.xml
@@ -99,11 +99,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -119,7 +119,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -134,7 +134,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Location</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_price.xml
index 7d30b860c5..fcc4b3b7ca 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_price.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Default Price</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
index d51cbd163d..cb04a16b84 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
@@ -68,7 +68,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -97,7 +97,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Quantity Unit</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_requirement_logical_path_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_requirement_logical_path_list.xml
index d4042a545f..4e00c5150e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_requirement_logical_path_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_requirement_logical_path_list.xml
@@ -88,15 +88,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -112,7 +112,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -127,7 +127,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirements</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_resource_title.xml
index 24f36589fa..277c118353 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_resource_title.xml
@@ -62,11 +62,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -78,7 +78,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -86,7 +86,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -97,11 +97,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>resource</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -117,7 +117,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -132,7 +132,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Service</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_project_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_project_title.xml
index 3f456ef076..feb107ab05 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_project_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_project_title.xml
@@ -97,11 +97,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_project</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -113,7 +113,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -132,7 +132,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Project</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_title.xml
index 532d69cfdc..4094b95936 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_source_title.xml
@@ -99,11 +99,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -119,7 +119,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -134,7 +134,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Assigned to</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_start_date.xml
index af8f80219b..b0bdc4958b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_start_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Begin Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_stop_date.xml
index e4d73c9138..9b1f284383 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_stop_date.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>End Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_price.xml
index 13b5adf56a..102ff0da4e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_price.xml
@@ -85,7 +85,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Total Price</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_quantity.xml
index 4e67bcffb1..2f6d0ca52d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_total_quantity.xml
@@ -85,7 +85,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Total Quantity</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_variation_category_list.xml
index 18012f91ee..e7184e5860 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_variation_category_list.xml
@@ -70,7 +70,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -95,11 +95,11 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>hash_script_id</string> </key>
+                    <key> <string>hash_script_id</string> </key>
                     <value> <string>DeliveryLine_hashVariationCategoryItemList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -107,7 +107,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Variation</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generateDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generateDomain.xml
index 7c5cab06ad..6c0854515f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generateDomain.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generateDomain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generatePersonDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generatePersonDomain.xml
index 4c87facc70..0367193c27 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generatePersonDomain.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_generatePersonDomain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_getTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_getTaskList.xml
index 064ac98e68..2a397f7469 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_getTaskList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_getTaskList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport.xml
index 4ad5eaee02..0709bfb1c4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList.xml
index a93f95771f..e39f23bba2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -79,7 +76,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_delivery_start_date</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
index ef729c7cf5..4b93bcf795 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
@@ -90,7 +90,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -147,7 +147,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -194,7 +194,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -205,11 +205,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -232,7 +232,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -243,7 +243,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -254,11 +254,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -297,11 +297,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>task_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -316,7 +316,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Tasks</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportLine_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportLine_viewFieldLibrary.xml
index 87a5a78f98..b3dd132ff2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportLine_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportLine_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_start_date</string>
@@ -102,7 +99,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
index 47e00e9826..85a714e29d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateDomain.xml
index dd4c776738..24e3174880 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateDomain.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateDomain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generatePersonDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generatePersonDomain.xml
index 04b718f0db..b16affd798 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generatePersonDomain.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generatePersonDomain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml
index 8e4c0e91ec..84075b0011 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_getTaskReportList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_getTaskReportList.xml
index a64255a275..efeaa7d354 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_getTaskReportList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_getTaskReportList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport.xml
index e40f45497c..313568bbe7 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList.xml
index 3355784f5f..df57eb378b 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,7 +80,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_delivery_start_date</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
index fd5011478a..2607c12087 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
@@ -90,7 +90,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -143,7 +143,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -190,7 +190,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -201,11 +201,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -228,7 +228,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -239,7 +239,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_root_list</string> </key>
+                    <key> <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -250,11 +250,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>report_tree</string> </key>
+                    <key> <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -301,11 +301,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>task_report_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -320,7 +320,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Task Reports</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getSourceTaskReportList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getSourceTaskReportList.xml
index 929fd7901e..8028940b40 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getSourceTaskReportList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getSourceTaskReportList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox.xml
index 5ee04d2a26..5d2c0dc56a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox.xml
@@ -126,7 +126,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -165,7 +165,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -196,7 +196,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -207,11 +207,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>task_report_line_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -226,7 +226,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Task Report Lines</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
index 61c28d9408..ad3efd66ee 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
@@ -75,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
index c19cf25ba4..3a0de43ce6 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportDialog.xml
index 5021bc8846..2e50db4531 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary.xml
index 2a57c1ceeb..ca4a6c3d41 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_destination_decision_title</string>
@@ -116,7 +113,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_comment.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_comment.xml
index ee5f08b9ba..6f86ca770c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_comment.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Comments</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_translated_causality_state_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_translated_causality_state_title.xml
index 3fd663f7cf..afb891549f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_translated_causality_state_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewFieldLibrary/my_translated_causality_state_title.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Causality State</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList.xml
index 8d2cd5dce5..8033c7e90d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_price.xml
index 0c083b7d9d..1c12ba4228 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_price.xml
@@ -94,7 +94,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity.xml
index 0d1e7f765f..c6bda627f5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity.xml
@@ -94,7 +94,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity_unit.xml
index 4d5c117446..6af8815ede 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewItemList/my_task_line_quantity_unit.xml
@@ -94,7 +94,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
index be292f62dc..5a83b2b81f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml
index 8c7a987434..bd2f1519b3 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_duplicate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_getTaskReportTranslatedSimulationStateTitle.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_getTaskReportTranslatedSimulationStateTitle.xml
index e1b24b3f90..961ab87162 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_getTaskReportTranslatedSimulationStateTitle.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_getTaskReportTranslatedSimulationStateTitle.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_init.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_init.xml
index 955670cda5..0f64f3759d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_init.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_init.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_isSimpleTask.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_isSimpleTask.xml
index 1a5ea61e7f..61f5dbd321 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_isSimpleTask.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_isSimpleTask.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml
index 419082983a..2a49957ce4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_selectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox.xml
index f1abd6e0bc..123e7f62ad 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox.xml
@@ -92,7 +92,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -131,7 +131,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -154,7 +154,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -166,7 +166,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -177,7 +177,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>task_line_selection</string> </value>
                 </item>
                 <item>
@@ -185,7 +185,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Task Lines</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox_quantity_unit.xml
index 61c28d9408..ad3efd66ee 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/listbox_quantity_unit.xml
@@ -75,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_source_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_source_title.xml
index c64a5c4406..a8d36bf7cb 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_source_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_source_title.xml
@@ -59,7 +59,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint.xml
index 60d806613b..7beb3695fe 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint/my_title.xml
index c46857d916..28f7f53137 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewConstraint/my_title.xml
@@ -150,7 +150,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog.xml
index 93813f84fb..17e921f912 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog/my_title.xml
index 9cab38e23a..6428b8ef4c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewDuplicateDialog/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary.xml
index c9d697439f..d0c9da0c50 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_start_date</string>
@@ -129,7 +126,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_administration_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_administration_title.xml
index d0494a04b6..bca8d19b51 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_administration_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_administration_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_administration</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Client Administrator</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_decision_title.xml
index 9a07ca0879..00d0d6e422 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_decision_title.xml
@@ -85,11 +85,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -105,13 +105,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -130,7 +130,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requested by</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_payment_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_payment_title.xml
index 80dfdae15a..6373a279d9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_payment_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_payment_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_payment</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Paid by</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_section_title.xml
index f84f52feee..f721e3d1de 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_destination_section_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_section</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Billable Client</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_administration_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_administration_title.xml
index ea56a4831f..23b9a899f5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_administration_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_administration_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_administration</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Supplier Administrator</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_decision_title.xml
index 276c213a2f..ff8cd03851 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_decision_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_decision</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Supervisor</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_payment_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_payment_title.xml
index 9c99aff43d..4d489f1878 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_payment_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_payment_title.xml
@@ -78,11 +78,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_payment</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -98,7 +98,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Paid to</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_section_title.xml
index 9b591b3a08..1568299544 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_source_section_title.xml
@@ -79,15 +79,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source_section</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -103,7 +103,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -122,7 +122,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Billing Supplier</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_task_line_requirement_logical_path_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_task_line_requirement_logical_path_list.xml
index 344aaec4bd..1ed27af07f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_task_line_requirement_logical_path_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewFieldLibrary/my_task_line_requirement_logical_path_list.xml
@@ -116,15 +116,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>task_line_requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -132,11 +132,11 @@
                     <value> <string>requirement</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>15</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -148,7 +148,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -163,11 +163,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Requirements</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value> <int>80</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewProfile.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewProfile.xml
index a545218cd5..f0c6ca91e8 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewProfile.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_viewProfile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
index ce58454354..31953c3560 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -161,9 +158,11 @@ ORDER BY <dtml-var order_by_expression>\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade.xml
index 54c56b97fa..66658a2134 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/BaseTradeProject_FieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/BaseTradeProject_FieldLibrary.xml
index 486f053df2..76bb983eca 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/BaseTradeProject_FieldLibrary.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/BaseTradeProject_FieldLibrary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view.xml
index e2d5082c6e..ca686191cf 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml
index 606ccc82c7..5ced4c6be7 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportDialog.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportDialog.xml
index 4a8dcec63c..67b8a97dd4 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportDialog.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
index 9379289822..d0b6284d7e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportOdtContainer.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportOdtContainer.xml
index 9e02e8fb03..a74135d110 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportOdtContainer.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportOdtContainer.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone.xml
index b56429b65b..63d94b5a22 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProfile.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProfile.xml
index 1bb72e219e..ee2f1ae050 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProfile.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProfile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject.xml
index 6eecaf3048..9a9c3324c1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/scripts.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/scripts.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete.xml
index 2659ed2cfa..80cd6128ec 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete_action.xml
index 362063e778..12b649c2f9 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/delete_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate.xml
index 1593b509f4..f2b812b258 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate_action.xml
index e724d200ad..480dc2b2f8 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/invalidate_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend.xml
index 984948328c..b37906fe56 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/suspend.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate.xml
index f1ee3e5e5f..02d0679fe4 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate_action.xml
index 5b1b73e677..09cbb64d94 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/transitions/validate_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/comment.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/comment.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/error_message.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/error_message.xml
index 05f2a3ece8..08c6214231 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/error_message.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/history.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/history.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/portal_type.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/portal_type.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/time.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/time.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow.xml
index ab732cf30a..d51b838827 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/scripts.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/scripts.xml
index 2f2c8347b6..86fd3005c7 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/scripts.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states.xml
index d6c2d2d922..cd2db0fb0c 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/cancelled.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/cancelled.xml
index 6fc0395b37..270c4aaa1b 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/cancelled.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/confirmed.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/confirmed.xml
index c6a54443d7..80c557ab92 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/confirmed.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/delivered.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/delivered.xml
index ae703a0612..42b90614e9 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/delivered.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/delivered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/draft.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/draft.xml
index 607a483d9f..0185a6af15 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/draft.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/planned.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/planned.xml
index 054b998172..a2a86d8459 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/planned.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/started.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/started.xml
index 2a39bd0d3a..267d94423e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/started.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/started.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/stopped.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/stopped.xml
index 5a3bfbd441..726c97a38e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/stopped.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/states/stopped.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions.xml
index 3763e3df95..61f19d835a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel.xml
index ff3b3c4e7d..7e6c616311 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel_action.xml
index 4f5457c1e7..3b6bfacd4b 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm.xml
index 3bd201c433..c9aabf5b52 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm_action.xml
index fcef176322..1f846b50ba 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver.xml
index 3eeba3f51f..8f03c1ab44 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver_action.xml
index edfef63ff0..6117d1133a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/deliver_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan.xml
index 00c5477576..8e8939f70b 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
index d8bfc8f326..da7b009c57 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start.xml
index 0a789f067e..a934122ea9 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
index 76a1b77e78..1424965041 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop.xml
index bfeb37c774..c86214409f 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
index fb7c606b7a..455ce3eca3 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables.xml
index 07046d72fe..7d9ea0fae8 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/action.xml
index dd344a268a..b6947a99ad 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml
index 1b57b099aa..719557507f 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/comment.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/comment.xml
index d225c5ad96..636dd21ecd 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/comment.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/history.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/history.xml
index 62edbc10c6..6270841fa0 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/history.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/time.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/time.xml
index 1ff286bc78..a8c1b7f62c 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/time.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/worklists.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/worklists.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow.xml
index f0fd88eb29..e2e88ad3af 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_acceptDecision.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_acceptDecision.xml
index 4f442833da..faad450e4e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_acceptDecision.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_acceptDecision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_adoptPrevision.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_adoptPrevision.xml
index 50d4e1b559..4290bb98cd 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_adoptPrevision.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_adoptPrevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_calculate.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_calculate.xml
index e99e128b0d..771ed8627b 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_calculate.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_calculate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
index 132fffe35b..d3ecbda551 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_split.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_split.xml
index d6339aa27b..0fcff343c0 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_split.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/scripts/PackingList_split.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/building.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/building.xml
index ca35fe88d6..fd9d6b607d 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/building.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/calculating.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/calculating.xml
index 2c8c208d16..94cc50ea25 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/calculating.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/calculating.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/diverged.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/diverged.xml
index 9211c88914..ba69a7358a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/diverged.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/diverged.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/draft.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/draft.xml
index 5a7fd7ac60..22218ae4c4 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/draft.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solved.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solved.xml
index cca08f364f..153818cce4 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solved.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solved.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solving.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solving.xml
index df1264240f..1dc04270aa 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solving.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/states/solving.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision.xml
index b2edb445a0..05442c969a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
index 4922534d70..e0eab6603e 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision.xml
index 79b1a1a22d..6fbefcf27a 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
index 7e0fdb227b..88d0b2d5a4 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/calculate.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/calculate.xml
index fae7f45a5b..69d831ab47 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/calculate.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/calculate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/converge.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/converge.xml
index 389c4d21c1..5fe67437fc 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/converge.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/converge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/diverge.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/diverge.xml
index 12a504b498..48816ec9c6 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/diverge.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/diverge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision.xml
index d4738e9429..9468b87330 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision_action.xml
index 39466caa9f..44d0c31245 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/split_prevision_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/start_building.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/start_building.xml
index 7638b58a62..373fc045b2 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/start_building.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/start_building.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/actor.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/comment.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/comment.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/history.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/history.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/portal_type.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/portal_type.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/time.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/time.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/worklists.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/worklists.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 7b89b2202c..d9beed0e29 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-406
\ No newline at end of file
+409
\ No newline at end of file
-- 
2.30.9