From 070a369f1e5fae598c15e072e1a584dda9943526 Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Mon, 26 May 2008 16:48:33 +0000
Subject: [PATCH] Update xml format.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21144 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Campaign%20Module/view.xml   |  14 +-
 .../portal_types/Campaign/new_event.xml       |  14 +-
 .../portal_types/Campaign/view.xml            |  14 +-
 .../portal_types/Event%20Module/view.xml      |  14 +-
 .../Event%20Module/workflow_report.xml        |  14 +-
 .../portal_types/Fax%20Message/assessment.xml |  21 +-
 .../portal_types/Fax%20Message/preview.xml    |  14 +-
 .../portal_types/Fax%20Message/view.xml       |  14 +-
 .../portal_types/Letter/assessment.xml        |  21 +-
 .../portal_types/Letter/preview.xml           |  14 +-
 .../portal_types/Letter/view.xml              |  14 +-
 .../Mail%20Message/assessment.xml             |  21 +-
 .../portal_types/Mail%20Message/preview.xml   |  14 +-
 .../portal_types/Mail%20Message/view.xml      |  14 +-
 .../portal_types/Meeting%20Module/view.xml    |  14 +-
 .../portal_types/Meeting/new_event.xml        |  14 +-
 .../portal_types/Meeting/view.xml             |  14 +-
 .../portal_types/Note/assessment.xml          |  21 +-
 .../portal_types/Note/preview.xml             |  14 +-
 .../portal_types/Note/view.xml                |  14 +-
 .../Person%20Module/create_event_list.xml     |  14 +-
 .../portal_types/Phone%20Call/assessment.xml  |  21 +-
 .../portal_types/Phone%20Call/preview.xml     |  14 +-
 .../portal_types/Phone%20Call/view.xml        |  14 +-
 .../Sale%20Opportunity%20Module/view.xml      |  14 +-
 .../Sale%20Opportunity/new_event.xml          |  14 +-
 .../portal_types/Sale%20Opportunity/view.xml  |  14 +-
 .../Support%20Request%20Module/view.xml       |  14 +-
 .../Support%20Request/new_event.xml           |  14 +-
 .../portal_types/Support%20Request/view.xml   |  14 +-
 .../portal_types/Visit/assessment.xml         |  21 +-
 .../portal_types/Visit/preview.xml            |  14 +-
 .../portal_types/Visit/view.xml               |  14 +-
 .../portal_types/Web%20Message/assessment.xml |  21 +-
 .../portal_types/Web%20Message/preview.xml    |  14 +-
 .../portal_types/Web%20Message/view.xml       |  14 +-
 .../z_related_source_or_destination.xml       |   6 +-
 .../z_related_source_organisation.xml         |  13 +-
 .../portal_types/Event%20Module.xml           |   7 +-
 .../portal_types/Fax%20Message.xml            |   7 +-
 .../portal_types/Letter.xml                   |   7 +-
 .../portal_types/Meeting%20Module.xml         |  66 +++-
 .../portal_types/Meeting.xml                  |   7 +-
 .../portal_types/Note.xml                     |   7 +-
 .../portal_types/Phone%20Call.xml             |   7 +-
 .../Sale%20Opportunity%20Module.xml           |   7 +-
 .../portal_types/Sale%20Opportunity.xml       |   7 +-
 .../Support%20Request%20Module.xml            |   7 +-
 .../portal_types/Support%20Request.xml        |   7 +-
 .../portal_types/Visit.xml                    |   7 +-
 .../portal_types/Web%20Message.xml            |   7 +-
 .../portal_skins/erp5_crm.xml                 |   7 +-
 .../Base_getEntityListFromFromHeader.xml      |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../erp5_crm/ERP5Site_getFollowUpItemList.xml |   2 +-
 ...ailDocument_viewAttachmentListRenderer.xml |   7 +-
 .../erp5_crm/Entity_addEventDialog.xml        |  10 +-
 .../your_portal_type.xml                      |   4 +-
 .../Entity_addEventDialog/your_resource.xml   |   4 +-
 .../Entity_addEventDialog/your_title.xml      |   2 +-
 .../erp5_crm/Entity_viewEventList/listbox.xml |  20 +-
 .../listbox_delivery_start_date.xml           |   2 +-
 .../Entity_viewEventList/my_title.xml         |   2 +-
 .../erp5_crm/EventModule_viewEventList.xml    |   7 +-
 .../EventModule_viewEventList/listbox.xml     |  16 +-
 .../listbox_destination_title.xml             |   6 +-
 .../erp5_crm/Event_createFollowUpTicket.xml   |   7 +-
 .../erp5_crm/Event_createSaleOpportunity.xml  |   7 +-
 .../erp5_crm/Event_createSupportRequest.xml   |   7 +-
 .../portal_skins/erp5_crm/Event_init.xml      |   7 +-
 .../erp5_crm/Event_rewriteIngestionData.xml   |   2 +-
 .../portal_skins/erp5_crm/Event_view.xml      |   7 +-
 .../Event_view/my_causality_title.xml         |   7 +-
 .../erp5_crm/Event_view/my_text_format.xml    |   9 +-
 .../your_title.xml                            |   2 +-
 .../Event_viewFieldLibrary/listbox.xml        |  18 +-
 .../my_aggregate_title_list.xml               |  20 +-
 .../my_causality_title.xml                    |  31 +-
 .../my_default_follow_up_title.xml            |  16 +-
 .../my_destination_title_list.xml             |   8 +-
 .../Event_viewFieldLibrary/my_resource.xml    |   8 +-
 .../my_source_title.xml                       |  20 +-
 .../Event_viewFieldLibrary/my_start_date.xml  |   8 +-
 .../Event_viewFieldLibrary/my_text_format.xml |   7 +-
 .../Event_viewFieldLibrary/my_title.xml       |   8 +-
 .../my_translated_portal_type.xml             |   4 +-
 .../my_translated_simulation_state_title.xml  |   8 +-
 .../your_portal_type.xml                      |   8 +-
 .../erp5_crm/Event_viewPreview.xml            |   7 +-
 .../listbox_destination_title.xml             |   6 +-
 .../Event_viewRelatedEventList/my_title.xml   |   2 +-
 .../erp5_crm/Event_viewRespondDialog.xml      |   9 +-
 .../Event_viewWorkflowAssignActionDialog.xml  |   7 +-
 .../your_comment.xml                          |   8 +-
 .../your_follow_up_ticket_title.xml           |   6 +-
 .../your_follow_up_ticket_type.xml            |   8 +-
 .../your_respond_event_title.xml              |   4 +-
 .../erp5_crm/Folder_viewTicketList.xml        |   9 +-
 .../Folder_viewTicketList/listbox.xml         |  16 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../MeetingModule_viewMeetingList.xml         |   7 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../erp5_crm/PersonModule_viewEmailReport.xml |   7 +-
 .../your_title.xml                            |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../listbox_start_date.xml                    |   2 +-
 .../listbox_stop_date.xml                     |   2 +-
 .../Ticket_getAssessmentFormIdList.xml        |   7 +-
 .../portal_skins/erp5_crm/Ticket_init.xml     |   7 +-
 .../Ticket_updateRelatedEventLocalRole.xml    |   7 +-
 .../Ticket_view/listbox_destination_title.xml |   6 +-
 .../erp5_crm/Ticket_view/my_description.xml   |   7 +-
 .../my_destination_decision_title.xml         |   9 +-
 .../my_destination_project_title.xml          |   4 +-
 .../my_destination_section_title.xml          |   9 +-
 .../Ticket_view/my_destination_title.xml      |   7 +-
 .../Ticket_view/my_price_currency.xml         |   7 +-
 .../erp5_crm/Ticket_view/my_quantity_unit.xml |   7 +-
 .../Ticket_view/my_source_decision_title.xml  |   7 +-
 .../Ticket_view/my_source_project_title.xml   |   4 +-
 .../Ticket_view/my_source_section_title.xml   |   7 +-
 .../erp5_crm/Ticket_view/my_source_title.xml  |   7 +-
 .../your_sale_opportunity_state.xml           |   8 +-
 .../your_validation_state.xml                 |   8 +-
 .../my_assessment_form_id.xml                 |  10 +-
 .../my_destination_decision_title.xml         |   8 +-
 .../my_destination_section_title.xml          |   8 +-
 .../my_destination_title.xml                  |   8 +-
 .../Ticket_viewFieldLibrary/my_price.xml      |   4 +-
 .../my_price_currency.xml                     |   4 +-
 .../Ticket_viewFieldLibrary/my_quantity.xml   |   2 +-
 .../my_quantity_unit.xml                      |   2 +-
 .../Ticket_viewFieldLibrary/my_resource.xml   |   4 +-
 .../my_source_decision_title.xml              |  10 +-
 .../my_source_section_title.xml               |   8 +-
 .../my_source_title.xml                       |   8 +-
 .../my_source_trade_title_list.xml            |   8 +-
 .../Ticket_viewFieldLibrary/my_start_date.xml |   2 +-
 .../Ticket_viewFieldLibrary/my_stop_date.xml  |   2 +-
 .../Ticket_viewFieldLibrary/my_title.xml      |   2 +-
 .../my_total_price.xml                        |   4 +-
 .../erp5_crm/Ticket_viewNewEventDialog.xml    |   7 +-
 .../Ticket_viewNewEventDialog/your_title.xml  |   7 +-
 .../your_at_date.xml                          |   4 +-
 .../your_campaign_type.xml                    |   8 +-
 .../your_from_date.xml                        |   4 +-
 .../your_meeting_type.xml                     |   8 +-
 .../your_sale_opportunity_state.xml           |   8 +-
 .../your_sale_opportunity_type.xml            |   8 +-
 .../your_support_request_type.xml             |   8 +-
 .../your_validation_state.xml                 |   8 +-
 .../ToolTemplateItem/mimetypes_registry.xml   | 360 +++++++++---------
 .../event_interaction_workflow.xml            |   7 +-
 .../interactions.xml                          |   7 +-
 .../interactions/Event_set.xml                |   7 +-
 .../event_interaction_workflow/scripts.xml    |   7 +-
 .../scripts/updateLocalRoles.xml              |   7 +-
 .../event_interaction_workflow/variables.xml  |   7 +-
 .../event_interaction_workflow/worklists.xml  |   7 +-
 .../portal_workflow/ticket_workflow.xml       |   7 +-
 .../ticket_workflow/scripts.xml               |   7 +-
 .../ticket_workflow/states.xml                |   7 +-
 .../ticket_workflow/states/cancelled.xml      |   7 +-
 .../ticket_workflow/states/deleted.xml        |   7 +-
 .../ticket_workflow/states/draft.xml          |   7 +-
 .../ticket_workflow/states/invalidated.xml    |   7 +-
 .../ticket_workflow/states/validated.xml      |   7 +-
 .../ticket_workflow/transitions.xml           |   7 +-
 .../ticket_workflow/transitions/cancel.xml    |   7 +-
 .../transitions/cancel_action.xml             |   7 +-
 .../ticket_workflow/transitions/delete.xml    |   7 +-
 .../transitions/delete_action.xml             |   7 +-
 .../transitions/invalidate.xml                |   7 +-
 .../transitions/invalidate_action.xml         |   7 +-
 .../ticket_workflow/transitions/submit.xml    |   7 +-
 .../transitions/submit_action.xml             |   7 +-
 .../ticket_workflow/transitions/validate.xml  |   7 +-
 .../transitions/validate_action.xml           |   7 +-
 .../ticket_workflow/variables.xml             |   7 +-
 .../ticket_workflow/variables/action.xml      |   7 +-
 .../ticket_workflow/variables/actor.xml       |   7 +-
 .../ticket_workflow/variables/comment.xml     |   7 +-
 .../ticket_workflow/variables/history.xml     |   7 +-
 .../ticket_workflow/variables/portal_type.xml |   7 +-
 .../ticket_workflow/variables/time.xml        |   7 +-
 .../ticket_workflow/worklists.xml             |   7 +-
 .../worklists/0A_draft_campaign_list.xml      |   7 +-
 .../worklists/0B_submitted_campaign_list.xml  |   7 +-
 .../worklists/0C_open_campaign_list.xml       |   7 +-
 .../worklists/1A_draft_meeting_list.xml       |   7 +-
 .../worklists/1B_submitted_meeting_list.xml   |   7 +-
 .../worklists/1C_open_meeting_list.xml        |   7 +-
 .../2A_draft_support_request_list.xml         |   7 +-
 .../2B_submitted_support_request_list.xml     |   7 +-
 .../2C_open_support_request_list.xml          |   7 +-
 bt5/erp5_crm/bt/revision                      |   2 +-
 206 files changed, 832 insertions(+), 1275 deletions(-)

diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign%20Module/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign%20Module/view.xml
index dc0d672678..2801c33fed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign%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_crm/ActionTemplateItem/portal_types/Campaign/new_event.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/new_event.xml
index b8dcba19c7..c894809275 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/new_event.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/new_event.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_crm/ActionTemplateItem/portal_types/Campaign/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/view.xml
index 70294181e3..a70369cc3d 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/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_crm/ActionTemplateItem/portal_types/Event%20Module/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/view.xml
index 5adac63993..9beab9e42f 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%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_crm/ActionTemplateItem/portal_types/Event%20Module/workflow_report.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/workflow_report.xml
index 9a0c191ba8..33755b8480 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/workflow_report.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%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_crm/ActionTemplateItem/portal_types/Fax%20Message/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/assessment.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_crm/ActionTemplateItem/portal_types/Fax%20Message/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/preview.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_crm/ActionTemplateItem/portal_types/Fax%20Message/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Fax%20Message/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_crm/ActionTemplateItem/portal_types/Letter/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/assessment.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_crm/ActionTemplateItem/portal_types/Letter/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/preview.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_crm/ActionTemplateItem/portal_types/Letter/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Letter/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_crm/ActionTemplateItem/portal_types/Mail%20Message/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/assessment.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_crm/ActionTemplateItem/portal_types/Mail%20Message/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/preview.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_crm/ActionTemplateItem/portal_types/Mail%20Message/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/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_crm/ActionTemplateItem/portal_types/Meeting%20Module/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting%20Module/view.xml
index c008d029e0..0a564d494b 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting%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_crm/ActionTemplateItem/portal_types/Meeting/new_event.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/new_event.xml
index b8dcba19c7..c894809275 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/new_event.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/new_event.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_crm/ActionTemplateItem/portal_types/Meeting/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/view.xml
index 70294181e3..a70369cc3d 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/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_crm/ActionTemplateItem/portal_types/Note/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/assessment.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_crm/ActionTemplateItem/portal_types/Note/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/preview.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_crm/ActionTemplateItem/portal_types/Note/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Note/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_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml
index 338a20015b..3762509816 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_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_crm/ActionTemplateItem/portal_types/Phone%20Call/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/assessment.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_crm/ActionTemplateItem/portal_types/Phone%20Call/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/preview.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_crm/ActionTemplateItem/portal_types/Phone%20Call/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/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_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/view.xml
index bf8d47df2c..c13f3d9cd4 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%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_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/new_event.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/new_event.xml
index b8dcba19c7..c894809275 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/new_event.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/new_event.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_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/view.xml
index 70294181e3..a70369cc3d 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/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_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/view.xml
index dc0d672678..2801c33fed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%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_crm/ActionTemplateItem/portal_types/Support%20Request/new_event.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/new_event.xml
index b8dcba19c7..c894809275 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/new_event.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/new_event.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_crm/ActionTemplateItem/portal_types/Support%20Request/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/view.xml
index 70294181e3..a70369cc3d 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/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_crm/ActionTemplateItem/portal_types/Visit/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/assessment.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_crm/ActionTemplateItem/portal_types/Visit/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/preview.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_crm/ActionTemplateItem/portal_types/Visit/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Visit/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_crm/ActionTemplateItem/portal_types/Web%20Message/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/assessment.xml
index 435f0329bb..1a757f5b99 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/assessment.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/assessment.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_crm/ActionTemplateItem/portal_types/Web%20Message/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/preview.xml
index 17e7da5967..96418efa60 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/preview.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/preview.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_crm/ActionTemplateItem/portal_types/Web%20Message/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/view.xml
index d0b6a27e1b..a475ca1bed 100644
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Web%20Message/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_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
index 5cb034a3dd..7b7754f5e1 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
@@ -54,9 +54,9 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>table_0</string>
-<string>table_1</string>
-<string>table_2</string>
+                            <string>table_0</string>
+                            <string>table_1</string>
+                            <string>table_2</string>
                           </list>
                         </value>
                     </item>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
index f33b7d0d4a..3dec6d2589 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.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>
@@ -130,9 +127,11 @@ AND <dtml-var table_1>.portal_type = \'Organisation\'\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_crm/PortalTypeTemplateItem/portal_types/Event%20Module.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Event%20Module.xml
index de328294a2..2bfc587595 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Event%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Event%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_crm/PortalTypeTemplateItem/portal_types/Fax%20Message.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Fax%20Message.xml
index 5f2177e5da..f4738cd7b6 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Fax%20Message.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Fax%20Message.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_crm/PortalTypeTemplateItem/portal_types/Letter.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Letter.xml
index 6c3b720ac3..31dba5cf66 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Letter.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Letter.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_crm/PortalTypeTemplateItem/portal_types/Meeting%20Module.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting%20Module.xml
index 75e1098d3b..92c943b72f 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting%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>
@@ -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_crm/PortalTypeTemplateItem/portal_types/Meeting.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting.xml
index d4e8354fe7..d170bc3ab0 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Meeting.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_crm/PortalTypeTemplateItem/portal_types/Note.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Note.xml
index ca9f27e682..6c90f80225 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Note.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Note.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_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.xml
index eb190fec05..c8c04d3de6 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.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_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%20Module.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%20Module.xml
index dc11ea245d..024e7da0c2 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%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_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.xml
index 891fa1626a..4cd5615638 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.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_crm/PortalTypeTemplateItem/portal_types/Support%20Request%20Module.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request%20Module.xml
index e53785e454..bb5d293185 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request%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_crm/PortalTypeTemplateItem/portal_types/Support%20Request.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request.xml
index 733bee9a94..13c01e7eda 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request.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_crm/PortalTypeTemplateItem/portal_types/Visit.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Visit.xml
index fed17afebd..1253a09a01 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Visit.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Visit.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_crm/PortalTypeTemplateItem/portal_types/Web%20Message.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Web%20Message.xml
index f4f62554b4..0acace0537 100644
--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Web%20Message.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Web%20Message.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_crm/SkinTemplateItem/portal_skins/erp5_crm.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm.xml
index b27de14a6e..2f88b3c7e0 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_getEntityListFromFromHeader.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_getEntityListFromFromHeader.xml
index f942a8a3f6..9c848bad40 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_getEntityListFromFromHeader.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_getEntityListFromFromHeader.xml
@@ -125,7 +125,7 @@ return result\n
                           <tuple>
                             <string>text</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>getResultValue</string>
                             <string>result</string>
                             <string>_getiter_</string>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignDetailedEventsList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_getFollowUpItemList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_getFollowUpItemList.xml
index afbfe8cf0f..606c4518d1 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_getFollowUpItemList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_getFollowUpItemList.xml
@@ -115,7 +115,7 @@ return map(lambda x:(x.getTitle(), x.getRelativeUrl()), node_list)\n
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>type_list</string>
                             <string>node_list</string>
                             <string>map</string>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EmailDocument_viewAttachmentListRenderer.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EmailDocument_viewAttachmentListRenderer.xml
index 8f257c4f97..3ad1527839 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EmailDocument_viewAttachmentListRenderer.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EmailDocument_viewAttachmentListRenderer.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog.xml
index af8bd304f4..f7b787328f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog.xml
@@ -87,25 +87,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>your_title</string>
@@ -116,7 +116,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_portal_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_portal_type.xml
index 7ca1e45602..c44feda0a1 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_portal_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_portal_type.xml
@@ -65,7 +65,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>
@@ -75,7 +75,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_resource.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_resource.xml
index ff97ceac8d..8d1ee016c5 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_resource.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_resource.xml
@@ -65,7 +65,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -73,7 +73,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_title.xml
index f1177018dc..084e757990 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEventDialog/your_title.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Event Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox.xml
index 2342e47996..6c97403065 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox.xml
@@ -90,7 +90,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -125,7 +125,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -160,7 +160,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -179,19 +179,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>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -226,11 +226,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>entity_related_event_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -241,7 +241,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -280,7 +280,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Events</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox_delivery_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox_delivery_start_date.xml
index 23088b04c0..ea82d15e6e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox_delivery_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/listbox_delivery_start_date.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/my_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/my_title.xml
index 981075ce2c..afa1669bbe 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/my_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_viewEventList/my_title.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_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
index 821c83a6b1..375a6e2736 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.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_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
index b4014d68bc..287ba2818a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
@@ -120,7 +120,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -181,7 +181,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,7 +247,7 @@
                     <value> <string>ORGANISATION_LIST</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -257,7 +257,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -312,11 +312,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>event_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -331,7 +331,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Events</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml
index 597d546feb..10380eb989 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml
@@ -58,13 +58,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createFollowUpTicket.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createFollowUpTicket.xml
index 6f5c462242..d2141bb1d2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createFollowUpTicket.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createFollowUpTicket.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml
index bcaadbc8cb..aab0c51eff 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSaleOpportunity.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml
index 22a83632ce..ca15a707ab 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createSupportRequest.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_init.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_init.xml
index 56c914e036..6296a7daca 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_init.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_rewriteIngestionData.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_rewriteIngestionData.xml
index 16dd42ab9a..cdeaa33f70 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_rewriteIngestionData.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_rewriteIngestionData.xml
@@ -112,7 +112,7 @@
                           <tuple>
                             <string>kw</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>_getitem_</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
index 11eb186586..03f8675b36 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_causality_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_causality_title.xml
index 56373681b8..23b5bffdd3 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_causality_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_causality_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_text_format.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_text_format.xml
index 88e48d17b6..9836a2de33 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_text_format.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_text_format.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -96,7 +93,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Content format</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventDialog/your_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventDialog/your_title.xml
index 5284ab88ad..e0c99964c6 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventDialog/your_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventDialog/your_title.xml
@@ -99,7 +99,7 @@
                     <value> <string>Event_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/listbox.xml
index 7a133cac2b..ce4d486a23 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/listbox.xml
@@ -120,7 +120,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -151,7 +151,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>default_params</string> </key>
+                    <key> <string>default_params</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -162,11 +162,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>List of all events related to the causality event</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -189,13 +189,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">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -222,11 +222,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>event_view_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -241,7 +241,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Events</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_aggregate_title_list.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_aggregate_title_list.xml
index a40c05f596..ec33d615ad 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_aggregate_title_list.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_aggregate_title_list.xml
@@ -63,15 +63,15 @@
             <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>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -85,7 +85,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -95,7 +95,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -106,11 +106,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>aggregate</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
@@ -118,7 +118,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -130,7 +130,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -149,7 +149,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Attachments</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_causality_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_causality_title.xml
index 8669c5c017..f4555d90fe 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_causality_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_causality_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,19 +67,19 @@
             <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>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -94,7 +91,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -104,7 +101,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -115,15 +112,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>causality</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>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -158,7 +155,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -170,7 +167,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -185,7 +182,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Event Origin</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_default_follow_up_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_default_follow_up_title.xml
index 66ffd37a37..3773c1fe45 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_default_follow_up_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_default_follow_up_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>
@@ -82,7 +82,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -92,7 +92,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -103,11 +103,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>follow_up</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>
@@ -138,7 +138,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Follow Up</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_destination_title_list.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_destination_title_list.xml
index 60e4c88bcf..41fd3986f4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_destination_title_list.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_destination_title_list.xml
@@ -59,11 +59,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>
@@ -75,7 +75,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>
@@ -83,7 +83,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_resource.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_resource.xml
index d88e727634..0ab214a237 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_resource.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_resource.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>
@@ -78,7 +78,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -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>Event Nature</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_source_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_source_title.xml
index 006dfbdf35..0156d9b723 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_source_title.xml
@@ -63,15 +63,15 @@
             <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>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -83,7 +83,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>
@@ -91,7 +91,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -102,15 +102,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>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -122,7 +122,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -141,7 +141,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Sender / Caller</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
index 2debe8182d..e9a3492636 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
@@ -91,15 +91,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>date_only</string> </key>
+                    <key> <string>date_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>default_now</string> </key>
+                    <key> <string>default_now</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -115,7 +115,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_text_format.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_text_format.xml
index 77935cc359..0c00d8b939 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_text_format.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_text_format.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>RadioField</string>
-        </tuple>
-        <none/>
+        <global name="RadioField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
index ac5e02d36a..2eb7e201fc 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
@@ -60,7 +60,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -78,7 +78,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -89,7 +89,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -105,7 +105,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_portal_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_portal_type.xml
index d17879362f..a69154d54f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_portal_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_portal_type.xml
@@ -93,7 +93,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -109,7 +109,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Event Type</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_simulation_state_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_simulation_state_title.xml
index 99758469a8..e77d85f75e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_translated_simulation_state_title.xml
@@ -60,7 +60,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -76,7 +76,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -87,7 +87,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -103,7 +103,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>State</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/your_portal_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/your_portal_type.xml
index 3556d65169..7ae9bb3bc9 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/your_portal_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/your_portal_type.xml
@@ -98,11 +98,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -120,13 +120,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>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Event Type</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview.xml
index 6a5e2fbc1e..299a329ae2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/listbox_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/listbox_destination_title.xml
index a05dfb64fb..9af0ca66ae 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/listbox_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/listbox_destination_title.xml
@@ -58,13 +58,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/my_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/my_title.xml
index 7e5f402612..765b605972 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/my_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRelatedEventList/my_title.xml
@@ -79,7 +79,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog.xml
index cd11009b78..7f6a977c00 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog.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,7 +71,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>your_reply_to</string>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog.xml
index 1cff5bf623..6d835209eb 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
index 11d1219347..6a2ccc8364 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
@@ -62,7 +62,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -95,7 +95,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>
@@ -103,11 +103,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Comment</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>1</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_title.xml
index 0c7289b8ef..48a3cd74ac 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_title.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>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -83,7 +83,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_type.xml
index 7bb00bc3ff..162c57a4c0 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_follow_up_ticket_type.xml
@@ -62,7 +62,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -76,11 +76,11 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -88,7 +88,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_title.xml
index 7ba8742e8c..dbcfb9a7d2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowRespondActionDialog/your_respond_event_title.xml
@@ -59,7 +59,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -86,7 +86,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList.xml
index ccfedb1f90..090fa8a74e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList.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>
@@ -98,7 +95,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
index 8a589eedaf..de62d97bb1 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
@@ -122,7 +122,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -211,7 +211,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -254,7 +254,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -281,7 +281,7 @@
                     <value> <int>5</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>30</int> </value>
                 </item>
                 <item>
@@ -293,7 +293,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -376,11 +376,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>ticket_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -467,7 +467,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Tickets</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingDetailedEventsList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList.xml
index 712addfcbe..5dab40916e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList.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_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml
index e94d31ad73..c405f46f5a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewEmailReport.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_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_title.xml
index 35377f2dba..dcf3ed57c5 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_title.xml
@@ -75,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityDetailedEventsList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestDetailedEventsList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_start_date.xml
index 200c47b868..20a4969674 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_start_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_stop_date.xml
index 74f14cc899..05db9b8a60 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox_stop_date.xml
@@ -81,7 +81,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getAssessmentFormIdList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getAssessmentFormIdList.xml
index f3ededbc35..8c0e0d783e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getAssessmentFormIdList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getAssessmentFormIdList.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_init.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_init.xml
index c6e8ac6a5f..2ea110dd89 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_init.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_updateRelatedEventLocalRole.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_updateRelatedEventLocalRole.xml
index 9c85ebe608..ea99a206d3 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_updateRelatedEventLocalRole.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_updateRelatedEventLocalRole.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml
index 597d546feb..10380eb989 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml
@@ -58,13 +58,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_description.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_description.xml
index afaf850cc1..a8764781c2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_description.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_description.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
index aa02523710..6d643ad7ee 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -170,7 +167,7 @@
                     <value> <string>Ticket_viewFieldLibrary</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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
index 20448e7c19..b74373aec2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
@@ -84,7 +84,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -99,7 +99,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 Project</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
index 627e6b7d6c..1b9b58e5d1 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -170,7 +167,7 @@
                     <value> <string>Ticket_viewFieldLibrary</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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
index 307c2407cd..46485b8644 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price_currency.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price_currency.xml
index 1ac98b53c5..dbfcff78ec 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price_currency.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_quantity_unit.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_quantity_unit.xml
index 6cc94f9143..53e879363f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_quantity_unit.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_quantity_unit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
index ba4f17be07..7ec4e7d349 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_project_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_project_title.xml
index 6a07b634a4..75c9138577 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_project_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_project_title.xml
@@ -84,7 +84,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -99,7 +99,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Handled Project</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
index fd9f8a921a..2dcc4dfc42 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
index e62e7c275d..0c1d4e37eb 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_sale_opportunity_state.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_sale_opportunity_state.xml
index 8c33c22115..46da65d96f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_sale_opportunity_state.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_sale_opportunity_state.xml
@@ -66,13 +66,13 @@
                     <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>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -82,7 +82,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -107,7 +107,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_validation_state.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_validation_state.xml
index f4e39768f3..af8ad4f216 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_validation_state.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewDialogFieldLibrary/your_validation_state.xml
@@ -66,13 +66,13 @@
                     <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>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -82,7 +82,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -107,7 +107,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_assessment_form_id.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_assessment_form_id.xml
index ab2bad89b8..f46ada16ef 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_assessment_form_id.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_assessment_form_id.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>
@@ -85,7 +85,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -96,7 +96,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -108,7 +108,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml
index ff14b2268f..b5b58e697a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml
index 21b7a1be83..9a34f1a394 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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>
@@ -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>Destination Section</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml
index 6740095cdf..97b88b23c7 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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>
@@ -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>Location</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price.xml
index 2889c6d05a..3b64b58ae2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Price for one unit.</string> </value>
                 </item>
                 <item>
@@ -92,7 +92,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 Price</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price_currency.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price_currency.xml
index 24923c9d2a..3c46cd1bf2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price_currency.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_price_currency.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>Currency</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity.xml
index 449f5857da..921213282d 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity.xml
@@ -86,7 +86,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>input_style</string> </key>
+                    <key> <string>input_style</string> </key>
                     <value> <string>-1234.5</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity_unit.xml
index 8a34dfc005..aa1f1a79ba 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity_unit.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_quantity_unit.xml
@@ -96,7 +96,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_resource.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_resource.xml
index 6d308d937b..dc90dbfd25 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_resource.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_resource.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>
@@ -78,7 +78,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
index 17bda15b54..41580af537 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
@@ -82,15 +82,15 @@
             <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>
-                    <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>Supervisor</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
index b76bb244f3..a064599741 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <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>
@@ -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>Billing Supplier</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
index a3f149f27b..8a685c3b10 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
@@ -81,11 +81,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>
@@ -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>
@@ -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>Handled by</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_trade_title_list.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_trade_title_list.xml
index c3ad0f623d..db633f65e2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_trade_title_list.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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>
@@ -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>Operators</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml
index af8f80219b..b0bdc4958b 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml
index e4d73c9138..9b1f284383 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_title.xml
index ab9d1670e6..b80434e718 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>40</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_total_price.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_total_price.xml
index 3bfb749ba4..28d7793cbd 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_total_price.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_total_price.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog.xml
index 2fd9431ab5..082ffae021 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog.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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
index f06c130142..7c1304e1a9 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_at_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_at_date.xml
index dd4318f16c..73407543b2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_at_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_at_date.xml
@@ -62,7 +62,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -87,7 +87,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_campaign_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_campaign_type.xml
index ccf6ca15e9..c4f5a1eaf5 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_campaign_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_campaign_type.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_from_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_from_date.xml
index b0e37301c4..951e48a095 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_from_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_from_date.xml
@@ -62,7 +62,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -87,7 +87,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_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_meeting_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_meeting_type.xml
index 6486264ffd..53cbabc23d 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_meeting_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_meeting_type.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_state.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_state.xml
index 5f17dbd81c..86ce271477 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_state.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_state.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_type.xml
index db5623c8b0..cd556f7017 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_sale_opportunity_type.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_support_request_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_support_request_type.xml
index 2083066cef..415d7dadd7 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_support_request_type.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_support_request_type.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_validation_state.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_validation_state.xml
index d7bd16f896..15db62febe 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_validation_state.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary/your_validation_state.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>enabled</string> </key>
+                    <key> <string>enabled</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -79,7 +79,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
@@ -89,7 +89,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_crm/ToolTemplateItem/mimetypes_registry.xml b/bt5/erp5_crm/ToolTemplateItem/mimetypes_registry.xml
index 08906e02dd..a2dba3f399 100644
--- a/bt5/erp5_crm/ToolTemplateItem/mimetypes_registry.xml
+++ b/bt5/erp5_crm/ToolTemplateItem/mimetypes_registry.xml
@@ -6931,7 +6931,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/h323</string>
+                <string>text/h323</string>
               </tuple>
             </value>
         </item>
@@ -7175,7 +7175,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-alchemy</string>
+                <string>chemical/x-alchemy</string>
               </tuple>
             </value>
         </item>
@@ -7219,7 +7219,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-jg</string>
+                <string>image/x-jg</string>
               </tuple>
             </value>
         </item>
@@ -7355,7 +7355,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-ncbi-asn1-spec</string>
+                <string>chemical/x-ncbi-asn1-spec</string>
               </tuple>
             </value>
         </item>
@@ -7400,7 +7400,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-ncbi-asn1-binary</string>
+                <string>chemical/x-ncbi-asn1-binary</string>
               </tuple>
             </value>
         </item>
@@ -7550,7 +7550,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-molconn-Z</string>
+                <string>chemical/x-molconn-Z</string>
               </tuple>
             </value>
         </item>
@@ -7597,7 +7597,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-msdos-program</string>
+                <string>application/x-msdos-program</string>
               </tuple>
             </value>
         </item>
@@ -7745,7 +7745,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-ms-bmp</string>
+                <string>image/x-ms-bmp</string>
               </tuple>
             </value>
         </item>
@@ -7795,7 +7795,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-maker</string>
+                <string>application/x-maker</string>
               </tuple>
             </value>
         </item>
@@ -7839,7 +7839,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-crossfire</string>
+                <string>chemical/x-crossfire</string>
               </tuple>
             </value>
         </item>
@@ -7994,7 +7994,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-chem3d</string>
+                <string>chemical/x-chem3d</string>
               </tuple>
             </value>
         </item>
@@ -8039,7 +8039,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cache</string>
+                <string>chemical/x-cache</string>
               </tuple>
             </value>
         </item>
@@ -8085,7 +8085,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cactvs-binary</string>
+                <string>chemical/x-cactvs-binary</string>
               </tuple>
             </value>
         </item>
@@ -8129,7 +8129,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.ms-pki.seccat</string>
+                <string>application/vnd.ms-pki.seccat</string>
               </tuple>
             </value>
         </item>
@@ -8173,7 +8173,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-cdf</string>
+                <string>application/x-cdf</string>
               </tuple>
             </value>
         </item>
@@ -8217,7 +8217,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-coreldraw</string>
+                <string>image/x-coreldraw</string>
               </tuple>
             </value>
         </item>
@@ -8261,7 +8261,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-coreldrawtemplate</string>
+                <string>image/x-coreldrawtemplate</string>
               </tuple>
             </value>
         </item>
@@ -8305,7 +8305,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cdx</string>
+                <string>chemical/x-cdx</string>
               </tuple>
             </value>
         </item>
@@ -8349,7 +8349,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.cinderella</string>
+                <string>application/vnd.cinderella</string>
               </tuple>
             </value>
         </item>
@@ -8394,7 +8394,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cxf</string>
+                <string>chemical/x-cxf</string>
               </tuple>
             </value>
         </item>
@@ -8438,7 +8438,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cerius</string>
+                <string>chemical/x-cerius</string>
               </tuple>
             </value>
         </item>
@@ -8482,7 +8482,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-chemdraw</string>
+                <string>chemical/x-chemdraw</string>
               </tuple>
             </value>
         </item>
@@ -8578,7 +8578,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cif</string>
+                <string>chemical/x-cif</string>
               </tuple>
             </value>
         </item>
@@ -8622,7 +8622,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/java-vm</string>
+                <string>application/java-vm</string>
               </tuple>
             </value>
         </item>
@@ -8724,7 +8724,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cmdf</string>
+                <string>chemical/x-cmdf</string>
               </tuple>
             </value>
         </item>
@@ -8768,7 +8768,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cml</string>
+                <string>chemical/x-cml</string>
               </tuple>
             </value>
         </item>
@@ -8812,7 +8812,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.rim.cod</string>
+                <string>application/vnd.rim.cod</string>
               </tuple>
             </value>
         </item>
@@ -8856,7 +8856,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-compass</string>
+                <string>chemical/x-compass</string>
               </tuple>
             </value>
         </item>
@@ -8952,7 +8952,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-corelphotopaint</string>
+                <string>image/x-corelphotopaint</string>
               </tuple>
             </value>
         </item>
@@ -8996,7 +8996,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-pkcs7-crl</string>
+                <string>application/x-pkcs7-crl</string>
               </tuple>
             </value>
         </item>
@@ -9096,7 +9096,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-cache-csf</string>
+                <string>chemical/x-cache-csf</string>
               </tuple>
             </value>
         </item>
@@ -9140,7 +9140,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-csh</string>
+                <string>text/x-csh</string>
               </tuple>
             </value>
         </item>
@@ -9185,7 +9185,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-csml</string>
+                <string>chemical/x-csml</string>
               </tuple>
             </value>
         </item>
@@ -9282,7 +9282,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/comma-separated-values</string>
+                <string>text/comma-separated-values</string>
               </tuple>
             </value>
         </item>
@@ -9326,7 +9326,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-ctx</string>
+                <string>chemical/x-ctx</string>
               </tuple>
             </value>
         </item>
@@ -9370,7 +9370,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/cu-seeme</string>
+                <string>application/cu-seeme</string>
               </tuple>
             </value>
         </item>
@@ -9414,7 +9414,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gaussian-cube</string>
+                <string>chemical/x-gaussian-cube</string>
               </tuple>
             </value>
         </item>
@@ -9514,7 +9514,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mopac-input</string>
+                <string>chemical/x-mopac-input</string>
               </tuple>
             </value>
         </item>
@@ -9560,7 +9560,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-director</string>
+                <string>application/x-director</string>
               </tuple>
             </value>
         </item>
@@ -9605,7 +9605,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-debian-package</string>
+                <string>application/x-debian-package</string>
               </tuple>
             </value>
         </item>
@@ -9650,7 +9650,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/dv</string>
+                <string>video/dv</string>
               </tuple>
             </value>
         </item>
@@ -9749,7 +9749,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/dl</string>
+                <string>video/dl</string>
               </tuple>
             </value>
         </item>
@@ -9793,7 +9793,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-apple-diskimage</string>
+                <string>application/x-apple-diskimage</string>
               </tuple>
             </value>
         </item>
@@ -9837,7 +9837,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-dms</string>
+                <string>application/x-dms</string>
               </tuple>
             </value>
         </item>
@@ -9977,7 +9977,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-jcamp-dx</string>
+                <string>chemical/x-jcamp-dx</string>
               </tuple>
             </value>
         </item>
@@ -10022,7 +10022,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-embl-dl-nucleotide</string>
+                <string>chemical/x-embl-dl-nucleotide</string>
               </tuple>
             </value>
         </item>
@@ -10120,7 +10120,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-pdb</string>
+                <string>chemical/x-pdb</string>
               </tuple>
             </value>
         </item>
@@ -10269,7 +10269,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gaussian-checkpoint</string>
+                <string>chemical/x-gaussian-checkpoint</string>
               </tuple>
             </value>
         </item>
@@ -10313,7 +10313,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-xfig</string>
+                <string>application/x-xfig</string>
               </tuple>
             </value>
         </item>
@@ -10357,7 +10357,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-flac</string>
+                <string>application/x-flac</string>
               </tuple>
             </value>
         </item>
@@ -10401,7 +10401,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/fli</string>
+                <string>video/fli</string>
               </tuple>
             </value>
         </item>
@@ -10445,7 +10445,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gaussian-log</string>
+                <string>chemical/x-gaussian-log</string>
               </tuple>
             </value>
         </item>
@@ -10491,7 +10491,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gamess-input</string>
+                <string>chemical/x-gamess-input</string>
               </tuple>
             </value>
         </item>
@@ -10537,7 +10537,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gaussian-input</string>
+                <string>chemical/x-gaussian-input</string>
               </tuple>
             </value>
         </item>
@@ -10581,7 +10581,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-pcs-gcd</string>
+                <string>text/x-pcs-gcd</string>
               </tuple>
             </value>
         </item>
@@ -10625,7 +10625,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-graphing-calculator</string>
+                <string>application/x-graphing-calculator</string>
               </tuple>
             </value>
         </item>
@@ -10669,7 +10669,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-gcg8-sequence</string>
+                <string>chemical/x-gcg8-sequence</string>
               </tuple>
             </value>
         </item>
@@ -10713,7 +10713,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-genbank</string>
+                <string>chemical/x-genbank</string>
               </tuple>
             </value>
         </item>
@@ -10861,7 +10861,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/gl</string>
+                <string>video/gl</string>
               </tuple>
             </value>
         </item>
@@ -10957,7 +10957,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mopac-graph</string>
+                <string>chemical/x-mopac-graph</string>
               </tuple>
             </value>
         </item>
@@ -11005,7 +11005,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-font</string>
+                <string>application/x-font</string>
               </tuple>
             </value>
         </item>
@@ -11049,7 +11049,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>audio/x-gsm</string>
+                <string>audio/x-gsm</string>
               </tuple>
             </value>
         </item>
@@ -11309,7 +11309,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-hin</string>
+                <string>chemical/x-hin</string>
               </tuple>
             </value>
         </item>
@@ -11455,7 +11455,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/hta</string>
+                <string>application/hta</string>
               </tuple>
             </value>
         </item>
@@ -11534,7 +11534,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-ica</string>
+                <string>application/x-ica</string>
               </tuple>
             </value>
         </item>
@@ -11578,7 +11578,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>x-conference/x-cooltalk</string>
+                <string>x-conference/x-cooltalk</string>
               </tuple>
             </value>
         </item>
@@ -11622,7 +11622,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-icon</string>
+                <string>image/x-icon</string>
               </tuple>
             </value>
         </item>
@@ -11775,7 +11775,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>model/iges</string>
+                <string>model/iges</string>
               </tuple>
             </value>
         </item>
@@ -11819,7 +11819,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-iphone</string>
+                <string>application/x-iphone</string>
               </tuple>
             </value>
         </item>
@@ -11864,7 +11864,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-internet-signup</string>
+                <string>application/x-internet-signup</string>
               </tuple>
             </value>
         </item>
@@ -11908,7 +11908,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-iso9660-image</string>
+                <string>application/x-iso9660-image</string>
               </tuple>
             </value>
         </item>
@@ -11953,7 +11953,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-isostar</string>
+                <string>chemical/x-isostar</string>
               </tuple>
             </value>
         </item>
@@ -11997,7 +11997,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/vnd.sun.j2me.app-descriptor</string>
+                <string>text/vnd.sun.j2me.app-descriptor</string>
               </tuple>
             </value>
         </item>
@@ -12041,7 +12041,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/java-archive</string>
+                <string>application/java-archive</string>
               </tuple>
             </value>
         </item>
@@ -12137,7 +12137,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-jmol</string>
+                <string>application/x-jmol</string>
               </tuple>
             </value>
         </item>
@@ -12551,7 +12551,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-kinemage</string>
+                <string>chemical/x-kinemage</string>
               </tuple>
             </value>
         </item>
@@ -12755,7 +12755,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-latex</string>
+                <string>application/x-latex</string>
               </tuple>
             </value>
         </item>
@@ -12905,7 +12905,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/x-la-asf</string>
+                <string>video/x-la-asf</string>
               </tuple>
             </value>
         </item>
@@ -12949,7 +12949,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-lzh</string>
+                <string>application/x-lzh</string>
               </tuple>
             </value>
         </item>
@@ -12993,7 +12993,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-lzx</string>
+                <string>application/x-lzx</string>
               </tuple>
             </value>
         </item>
@@ -13259,7 +13259,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mmcif</string>
+                <string>chemical/x-mmcif</string>
               </tuple>
             </value>
         </item>
@@ -13303,7 +13303,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-macmolecule</string>
+                <string>chemical/x-macmolecule</string>
               </tuple>
             </value>
         </item>
@@ -13347,7 +13347,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/msaccess</string>
+                <string>application/msaccess</string>
               </tuple>
             </value>
         </item>
@@ -13391,7 +13391,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-troff-me</string>
+                <string>application/x-troff-me</string>
               </tuple>
             </value>
         </item>
@@ -13437,7 +13437,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>model/mesh</string>
+                <string>model/mesh</string>
               </tuple>
             </value>
         </item>
@@ -13533,7 +13533,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-freemind</string>
+                <string>application/x-freemind</string>
               </tuple>
             </value>
         </item>
@@ -13578,7 +13578,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-macromodel-input</string>
+                <string>chemical/x-macromodel-input</string>
               </tuple>
             </value>
         </item>
@@ -13622,7 +13622,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.smaf</string>
+                <string>application/vnd.smaf</string>
               </tuple>
             </value>
         </item>
@@ -13770,7 +13770,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-mo</string>
+                <string>application/x-mo</string>
               </tuple>
             </value>
         </item>
@@ -13866,7 +13866,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mdl-molfile</string>
+                <string>chemical/x-mdl-molfile</string>
               </tuple>
             </value>
         </item>
@@ -13910,7 +13910,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mol2</string>
+                <string>chemical/x-mol2</string>
               </tuple>
             </value>
         </item>
@@ -13954,7 +13954,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mopac-out</string>
+                <string>chemical/x-mopac-out</string>
               </tuple>
             </value>
         </item>
@@ -14158,7 +14158,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-troff-ms</string>
+                <string>application/x-troff-ms</string>
               </tuple>
             </value>
         </item>
@@ -14202,7 +14202,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-msi</string>
+                <string>application/x-msi</string>
               </tuple>
             </value>
         </item>
@@ -14246,7 +14246,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mopac-vib</string>
+                <string>chemical/x-mopac-vib</string>
               </tuple>
             </value>
         </item>
@@ -14290,7 +14290,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/vnd.mpegurl</string>
+                <string>video/vnd.mpegurl</string>
               </tuple>
             </value>
         </item>
@@ -14439,7 +14439,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-nwc</string>
+                <string>application/x-nwc</string>
               </tuple>
             </value>
         </item>
@@ -15367,7 +15367,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-oz-application</string>
+                <string>application/x-oz-application</string>
               </tuple>
             </value>
         </item>
@@ -15569,7 +15569,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-pkcs7-certreqresp</string>
+                <string>application/x-pkcs7-certreqresp</string>
               </tuple>
             </value>
         </item>
@@ -15613,7 +15613,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-ns-proxy-autoconfig</string>
+                <string>application/x-ns-proxy-autoconfig</string>
               </tuple>
             </value>
         </item>
@@ -15657,7 +15657,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-coreldrawpattern</string>
+                <string>image/x-coreldrawpattern</string>
               </tuple>
             </value>
         </item>
@@ -15755,7 +15755,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/pict</string>
+                <string>image/pict</string>
               </tuple>
             </value>
         </item>
@@ -15799,7 +15799,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/pcx</string>
+                <string>image/pcx</string>
               </tuple>
             </value>
         </item>
@@ -16052,7 +16052,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-httpd-php</string>
+                <string>application/x-httpd-php</string>
               </tuple>
             </value>
         </item>
@@ -16096,7 +16096,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-httpd-php3</string>
+                <string>application/x-httpd-php3</string>
               </tuple>
             </value>
         </item>
@@ -16140,7 +16140,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-httpd-php3-preprocessed</string>
+                <string>application/x-httpd-php3-preprocessed</string>
               </tuple>
             </value>
         </item>
@@ -16184,7 +16184,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-httpd-php4</string>
+                <string>application/x-httpd-php4</string>
               </tuple>
             </value>
         </item>
@@ -16228,7 +16228,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-httpd-php-source</string>
+                <string>application/x-httpd-php-source</string>
               </tuple>
             </value>
         </item>
@@ -16272,7 +16272,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/pjpeg</string>
+                <string>image/pjpeg</string>
               </tuple>
             </value>
         </item>
@@ -16369,7 +16369,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-perl</string>
+                <string>text/x-perl</string>
               </tuple>
             </value>
         </item>
@@ -16569,7 +16569,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-po</string>
+                <string>text/x-po</string>
               </tuple>
             </value>
         </item>
@@ -16723,7 +16723,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/pics-rules</string>
+                <string>application/pics-rules</string>
               </tuple>
             </value>
         </item>
@@ -16767,7 +16767,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-ncbi-asn1-ascii</string>
+                <string>chemical/x-ncbi-asn1-ascii</string>
               </tuple>
             </value>
         </item>
@@ -16811,7 +16811,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-photoshop</string>
+                <string>image/x-photoshop</string>
               </tuple>
             </value>
         </item>
@@ -16880,7 +16880,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-python-code</string>
+                <string>application/x-python-code</string>
               </tuple>
             </value>
         </item>
@@ -16924,7 +16924,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-quicktimeplayer</string>
+                <string>application/x-quicktimeplayer</string>
               </tuple>
             </value>
         </item>
@@ -16968,7 +16968,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>audio/x-realaudio</string>
+                <string>audio/x-realaudio</string>
               </tuple>
             </value>
         </item>
@@ -17069,7 +17069,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/rar</string>
+                <string>application/rar</string>
               </tuple>
             </value>
         </item>
@@ -17165,7 +17165,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mdl-rdfile</string>
+                <string>chemical/x-mdl-rdfile</string>
               </tuple>
             </value>
         </item>
@@ -17209,7 +17209,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/rdf+xml</string>
+                <string>application/rdf+xml</string>
               </tuple>
             </value>
         </item>
@@ -17377,7 +17377,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-rosdal</string>
+                <string>chemical/x-rosdal</string>
               </tuple>
             </value>
         </item>
@@ -17421,7 +17421,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-redhat-package-manager</string>
+                <string>application/x-redhat-package-manager</string>
               </tuple>
             </value>
         </item>
@@ -17465,7 +17465,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/rss+xml</string>
+                <string>application/rss+xml</string>
               </tuple>
             </value>
         </item>
@@ -17585,7 +17585,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mdl-rxnfile</string>
+                <string>chemical/x-mdl-rxnfile</string>
               </tuple>
             </value>
         </item>
@@ -17630,7 +17630,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/scriptlet</string>
+                <string>text/scriptlet</string>
               </tuple>
             </value>
         </item>
@@ -17675,7 +17675,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mdl-sdfile</string>
+                <string>chemical/x-mdl-sdfile</string>
               </tuple>
             </value>
         </item>
@@ -17719,7 +17719,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>audio/x-sd2</string>
+                <string>audio/x-sd2</string>
               </tuple>
             </value>
         </item>
@@ -18028,7 +18028,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/java-serialized-object</string>
+                <string>application/java-serialized-object</string>
               </tuple>
             </value>
         </item>
@@ -18072,7 +18072,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-go-sgf</string>
+                <string>application/x-go-sgf</string>
               </tuple>
             </value>
         </item>
@@ -18116,7 +18116,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.stardivision.writer-global</string>
+                <string>application/vnd.stardivision.writer-global</string>
               </tuple>
             </value>
         </item>
@@ -18161,7 +18161,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-sgml</string>
+                <string>text/x-sgml</string>
               </tuple>
             </value>
         </item>
@@ -18205,7 +18205,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-sh</string>
+                <string>text/x-sh</string>
               </tuple>
             </value>
         </item>
@@ -18354,7 +18354,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.symbian.install</string>
+                <string>application/vnd.symbian.install</string>
               </tuple>
             </value>
         </item>
@@ -18455,7 +18455,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-koan</string>
+                <string>application/x-koan</string>
               </tuple>
             </value>
         </item>
@@ -18606,7 +18606,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-galactic-spc</string>
+                <string>chemical/x-galactic-spc</string>
               </tuple>
             </value>
         </item>
@@ -18650,7 +18650,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-futuresplash</string>
+                <string>application/x-futuresplash</string>
               </tuple>
             </value>
         </item>
@@ -18902,7 +18902,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.ms-pki.stl</string>
+                <string>application/vnd.ms-pki.stl</string>
               </tuple>
             </value>
         </item>
@@ -19171,7 +19171,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-swissprot</string>
+                <string>chemical/x-swissprot</string>
               </tuple>
             </value>
         </item>
@@ -19687,7 +19687,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-texinfo</string>
+                <string>application/x-texinfo</string>
               </tuple>
             </value>
         </item>
@@ -19731,7 +19731,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-mdl-tgf</string>
+                <string>chemical/x-mdl-tgf</string>
               </tuple>
             </value>
         </item>
@@ -19830,7 +19830,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/texmacs</string>
+                <string>text/texmacs</string>
               </tuple>
             </value>
         </item>
@@ -19926,7 +19926,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/dsptype</string>
+                <string>application/dsptype</string>
               </tuple>
             </value>
         </item>
@@ -20022,7 +20022,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/iuls</string>
+                <string>text/iuls</string>
               </tuple>
             </value>
         </item>
@@ -20118,7 +20118,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-cdlink</string>
+                <string>application/x-cdlink</string>
               </tuple>
             </value>
         </item>
@@ -20217,7 +20217,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-vmd</string>
+                <string>chemical/x-vmd</string>
               </tuple>
             </value>
         </item>
@@ -20261,7 +20261,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-vamas-iso14976</string>
+                <string>chemical/x-vamas-iso14976</string>
               </tuple>
             </value>
         </item>
@@ -20307,7 +20307,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>x-world/x-vrml</string>
+                <string>x-world/x-vrml</string>
               </tuple>
             </value>
         </item>
@@ -20351,7 +20351,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.visio</string>
+                <string>application/vnd.visio</string>
               </tuple>
             </value>
         </item>
@@ -20395,7 +20395,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-doom</string>
+                <string>application/x-doom</string>
               </tuple>
             </value>
         </item>
@@ -20493,7 +20493,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>audio/x-ms-wax</string>
+                <string>audio/x-ms-wax</string>
               </tuple>
             </value>
         </item>
@@ -20537,7 +20537,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/vnd.wap.wbmp</string>
+                <string>image/vnd.wap.wbmp</string>
               </tuple>
             </value>
         </item>
@@ -20581,7 +20581,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.wap.wbxml</string>
+                <string>application/vnd.wap.wbxml</string>
               </tuple>
             </value>
         </item>
@@ -20625,7 +20625,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-123</string>
+                <string>application/x-123</string>
               </tuple>
             </value>
         </item>
@@ -20669,7 +20669,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/x-ms-wm</string>
+                <string>video/x-ms-wm</string>
               </tuple>
             </value>
         </item>
@@ -20713,7 +20713,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>audio/x-ms-wma</string>
+                <string>audio/x-ms-wma</string>
               </tuple>
             </value>
         </item>
@@ -20757,7 +20757,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-ms-wmd</string>
+                <string>application/x-ms-wmd</string>
               </tuple>
             </value>
         </item>
@@ -20853,7 +20853,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.wap.wmlc</string>
+                <string>application/vnd.wap.wmlc</string>
               </tuple>
             </value>
         </item>
@@ -20897,7 +20897,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/vnd.wap.wmlscript</string>
+                <string>text/vnd.wap.wmlscript</string>
               </tuple>
             </value>
         </item>
@@ -20941,7 +20941,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/vnd.wap.wmlscriptc</string>
+                <string>application/vnd.wap.wmlscriptc</string>
               </tuple>
             </value>
         </item>
@@ -21037,7 +21037,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/x-ms-wmx</string>
+                <string>video/x-ms-wmx</string>
               </tuple>
             </value>
         </item>
@@ -21081,7 +21081,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-ms-wmz</string>
+                <string>application/x-ms-wmz</string>
               </tuple>
             </value>
         </item>
@@ -21125,7 +21125,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/wordperfect5.1</string>
+                <string>application/wordperfect5.1</string>
               </tuple>
             </value>
         </item>
@@ -21223,7 +21223,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>video/x-ms-wvx</string>
+                <string>video/x-ms-wvx</string>
               </tuple>
             </value>
         </item>
@@ -21267,7 +21267,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-wingz</string>
+                <string>application/x-wingz</string>
               </tuple>
             </value>
         </item>
@@ -21363,7 +21363,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-xcf</string>
+                <string>application/x-xcf</string>
               </tuple>
             </value>
         </item>
@@ -21546,7 +21546,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-xpinstall</string>
+                <string>application/x-xpinstall</string>
               </tuple>
             </value>
         </item>
@@ -21642,7 +21642,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/xml</string>
+                <string>application/xml</string>
               </tuple>
             </value>
         </item>
@@ -21686,7 +21686,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-xtel</string>
+                <string>chemical/x-xtel</string>
               </tuple>
             </value>
         </item>
@@ -21834,7 +21834,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>chemical/x-xyz</string>
+                <string>chemical/x-xyz</string>
               </tuple>
             </value>
         </item>
@@ -27901,7 +27901,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-arc</string>
+                <string>application/x-arc</string>
               </tuple>
             </value>
         </item>
@@ -28736,7 +28736,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-dbm</string>
+                <string>application/x-dbm</string>
               </tuple>
             </value>
         </item>
@@ -29779,7 +29779,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-frame</string>
+                <string>application/x-frame</string>
               </tuple>
             </value>
         </item>
@@ -29865,7 +29865,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-gdbm</string>
+                <string>application/x-gdbm</string>
               </tuple>
             </value>
         </item>
@@ -30828,7 +30828,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-ksysv-package</string>
+                <string>application/x-ksysv-package</string>
               </tuple>
             </value>
         </item>
@@ -31346,7 +31346,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-mswinurl</string>
+                <string>application/x-mswinurl</string>
               </tuple>
             </value>
         </item>
@@ -32355,7 +32355,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>application/x-sc</string>
+                <string>application/x-sc</string>
               </tuple>
             </value>
         </item>
@@ -34933,7 +34933,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-niff</string>
+                <string>image/x-niff</string>
               </tuple>
             </value>
         </item>
@@ -34975,7 +34975,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>image/x-pcx</string>
+                <string>image/x-pcx</string>
               </tuple>
             </value>
         </item>
@@ -37487,7 +37487,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/x-ksysv-log</string>
+                <string>text/x-ksysv-log</string>
               </tuple>
             </value>
         </item>
@@ -38236,7 +38236,7 @@
             <key> <string>mimetypes</string> </key>
             <value>
               <tuple>
-<string>text/xmcd</string>
+                <string>text/xmcd</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow.xml
index 3ee660809e..83b46692f1 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.InteractionWorkflow</string>
-          <string>InteractionWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions.xml
index 7d8c51003b..879a78b540 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>Interaction</string>
-        </tuple>
-        <none/>
+        <global name="Interaction" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions/Event_set.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions/Event_set.xml
index aee8ca4a05..de19a4ebcf 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions/Event_set.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/interactions/Event_set.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5.Interaction</string>
-          <string>InteractionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_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_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts/updateLocalRoles.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts/updateLocalRoles.xml
index d1612c471f..52e724cee6 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts/updateLocalRoles.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/scripts/updateLocalRoles.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_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/variables.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/variables.xml
index db67387d4e..733d9ce458 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/variables.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_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_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/worklists.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/worklists.xml
index f4c2789633..3953ad0209 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_workflow/worklists.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_interaction_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
index b1cb23fa9b..335640c8ae 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml
index 18cfa89896..b95a5493c6 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/cancelled.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml
index 4f2b965689..1104cd8d00 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/deleted.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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml
index 124f2560be..716449dd53 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/draft.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml
index eb78aed358..214d44483c 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/invalidated.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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml
index b01e8ea98c..0b33f026d2 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/validated.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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml
index 6622b21b0c..ce5ada37dd 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml
index 0e29d90725..79054f7a72 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml
index 754c920791..577a40115c 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml
index 462abf39f6..d1229311dc 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml
index 021d84e008..1f55c3d360 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml
index 05b299e8f4..72872760c7 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml
index 4ed3371198..e07471ea82 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit.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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml
index cb284c1051..0e468488ab 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/submit_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml
index 3d23d936b9..25e77c0f66 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml
index 058f64e6f5..94c8b0d1b0 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/actor.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/comment.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/comment.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/history.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/history.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/portal_type.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/portal_type.xml
index 89f7aa820c..af61062944 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/portal_type.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/time.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/time.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_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_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml
index 5fed6b5591..67e1670fd7 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml
index 540469cc08..9c3a3d2de2 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml
index 51fbc60063..a8ade110d8 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml
index 0fcd3eeaed..b7bd4554f7 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml
index 8c5254f07c..249996379d 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml
index 1de5d7483c..231aea979e 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml
index fe003b2e8e..dd270d4134 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml
index 9397843e65..7100c632b8 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml
index 983df0f47e..90d1fc1f73 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 104fcf5b4e..e0c1820214 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-243
\ No newline at end of file
+244
\ No newline at end of file
-- 
2.30.9