Only changes in XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17935 20353a03-c40f-0410-a6d1-a30d3c3de9de

Only changes in XML format
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17935 20353a03-c40f-0410-a6d1-a30d3c3de9de
26ca885e · Jérome Perrin · a10f1d66 · 26ca885e · 26ca885e · 26ca885e
Commit 26ca885e authored Nov 30, 2007 by Jérome Perrin
183 changed files
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.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>
@@ -166,6 +163,7 @@ return listbox_lines\n
                            <string>column_name_list</string>
                            <string>column</string>
                            <string>safe_id</string>
+                            <string>_inplacevar_</string>
                            <string>int_len</string>
                            <string>o</string>
                          </tuple>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.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>
@@ -121,7 +118,7 @@ if email is not None:\n
                          <tuple>
                            <string>kw</string>
                            <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                            <string>email</string>
                            <string>None</string>
                          </tuple>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
@@ -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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.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>
@@ -107,9 +104,11 @@ ORDER BY Date</string> </value>
            <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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>

--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
-238
\ No newline at end of file
+239
\ No newline at end of file