diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
index 4d7d1cd427c5e6510dd0b77551bb64e84a9d9535..4a25be6c22c37fd8074de43dda323b7e41611f3c 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
@@ -51,8 +51,8 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>table_0</string>
-<string>table_1</string>
+ <string>table_0</string>
+ <string>table_1</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
index 508929e16d983dbae0659d8c8b9807cc3d4d3343..f33b7d0d4a659a5f102df983d0d6dbeea121e6c6 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
@@ -51,8 +51,8 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>table_0</string>
-<string>table_1</string>
+ <string>table_0</string>
+ <string>table_1</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
index 0c03abf6082d222dfe817c5dc63ac22b39590b1e..df3f6498eb4e1252206cd645516464cfac250857 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
@@ -51,8 +51,8 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>table_0</string>
-<string>table_1</string>
+ <string>table_0</string>
+ <string>table_1</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
index 640b775362997bd4cf863836d0f709fcbdcfcc74..5aa3c03262bb6c6133852dae07f81c21ebe9de9c 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
@@ -431,6 +431,10 @@
<key> <string>id</string> </key>
<value> <string>region</string> </value>
</item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string>Region</string> </value>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml
deleted file mode 100644
index 499c28e1ba51964b995f550ce182d0e15fec5c54..0000000000000000000000000000000000000000
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.ERP5.Tool.Category</string>
- <string>Category</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_count</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_mt_index</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_tree</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>codification</string> </key>
- <value> <string>F</string> </value>
- </item>
- <item>
- <key> <string>default_reference</string> </key>
- <value> <string>F</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>female</string> </value>
- </item>
- <item>
- <key> <string>int_index</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Female</string> </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <none/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.Length</string>
- <string>Length</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle> <int>0</int> </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <none/>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <none/>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml
deleted file mode 100644
index c3db49b13b1decfd8935f58dd8a6010bd11a5df0..0000000000000000000000000000000000000000
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.ERP5.Tool.Category</string>
- <string>Category</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_count</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_mt_index</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_tree</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>codification</string> </key>
- <value> <string>M</string> </value>
- </item>
- <item>
- <key> <string>default_reference</string> </key>
- <value> <string>M</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>male</string> </value>
- </item>
- <item>
- <key> <string>int_index</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Male</string> </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <none/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.Length</string>
- <string>Length</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle> <int>0</int> </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <none/>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <tuple>
- <string>BTrees.OOBTree</string>
- <string>OOBTree</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <none/>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
index cdb03241e077a4a5fe27a2b77ea378440adeae12..c36dbc1716ad82faf8621c8ff0626a22fffbb403 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Address.xml
@@ -42,6 +42,10 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>acquire_local_roles</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
@@ -74,6 +78,12 @@
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
@@ -84,6 +94,10 @@
<key> <string>id</string> </key>
<value> <string>Address</string> </value>
</item>
+ <item>
+ <key> <string>init_script</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
index 71fed8dfdc0c2e47dbf0cdcc936ca3538a1159a2..302ace625410dc494465a28b1c2dab628e75c5c9 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
@@ -66,7 +66,7 @@
<key> <string>description</string> </key>
<value> <string>\n
An Agent Privilege allow the Bank Account owner to give permissions to an Agent for a given period of time, for a maximum amount of money.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
index 3081a5c8c60a4b7ce5f74ef38c96e8ca750cdf4c..743a3bf137632d90ebaa44d84da51bc1e3007cae 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Agent.xml
@@ -69,7 +69,7 @@
<item>
<key> <string>description</string> </key>
<value> <string> An Agent is a Person who is permitted to perform some actions on the bank account according to Privileges.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
index b78b74a505ab1c52266581f6d00119ae62856618..659c1217f32e9fb2457bd6b1f40a79960724e8a5 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
@@ -76,7 +76,7 @@
management of the bank account to trusted third-party Persons.\n
\n
BankAccount inherits from Base and from the mix-in Coordinate.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
index 3dd0e6f110c4ae1522b461d40a617c7fdb133441..a09bdebcb3540b5b6a8117d0bdbb1478bbeba4c7 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
@@ -76,7 +76,7 @@
management of the bank account to trusted third-party Persons.\n
\n
BankAccount inherits from Base and from the mix-in Coordinate.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
index 21b601a0c6cdf478c10df03ff1654bd93b3d0d6d..a4edc360a6fe7b942973dea17ce0d44c740435aa 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
@@ -69,7 +69,7 @@
\n
It may include a price (for insurance, for customs, for invoices,\n
for orders)\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
index f56c346c8b086a33179cde8eb2f725af3a871379..2beb6960600de8a567e8e2be042c085d8ff82684 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Link.xml
@@ -67,7 +67,7 @@
<value> <string>\n
A Url is allows to represent in a standard way coordinates\n
such as web sites, emails, ftp sites, etc.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
index 18f2e1b802a11f617f551cd5ef6aa65e12a706eb..8bcf8daf71acba498c0e6e9168106ad6a1d87ca4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>image_view</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
index 679c23beb5e05881db178e809ea1b109e74e72db..b90804086010f2db177390c0f9ad9ada3a2bd1ed 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>your_import_file</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
index c55d5da8ec326baada4f021d8099440688bfafae..ba3dfef3af4ddfd23fbcf2bad418ad319ffcf139 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_id</string>
@@ -99,7 +99,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_destination_title</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml
index 3a93083d133d1b719055bd08fda4826a0c2ef3c1..11a6cad896fb0bd5a39b2a31ac920da08d29ced9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml
index 958b8d3eff4d7f516675ad6f7350e2e7b95554c9..1699d7968bfaafdb0c30f18b85921d5ab45d760a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
index 7ae5ba8329b269f5559155af82d12f4cf1bab328..3a8347122ba383f6af05f61af2933cb5901e474d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
@@ -83,7 +83,9 @@ return (currency_exchange_type_list, resource_list, price_currency_list)\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
@@ -126,7 +128,7 @@ return (currency_exchange_type_list, resource_list, price_currency_list)\n
<string>_getiter_</string>
<string>_getitem_</string>
<string>_getattr_</string>
-<string>context</string>
+ <string>context</string>
<string>x</string>
<string>currency_exchange_type_list</string>
<string>resource_list</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_start_date.xml
index 78f8b0cb8d03eedad5120a45e936106f28a84c62..ab2458365f1180656ce881d771964708519e4178 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_start_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_stop_date.xml
index 5dfa8b95c290fdbcd7109c71cac01e38aaeed477..c6cdd91bb50f7911f2ff74600aea8d0b29e01fcc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_stop_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
index 022df371afac8947d13ae3db27ad81393bf030d9..1fe1f637a2895c86c4b7ae0b624c675abf46845b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
@@ -90,7 +90,9 @@ return [getattr(mapped_value, \'base_price\', None), getattr(mapped_value, \'dis
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
index 672d13edb7a15883ac8c02da810597b4977cf6ca..af4dfd9cdcaf1a9302cfc778f3dc77a5feed58ad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList.xml
@@ -89,7 +89,9 @@ return result\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/CurrencyModule_getCurrencyItemList</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
index 91141f06c097784252223973b7c1d2589647ce2a..974b6da3cd1c1b59dc87ce1b84d92691b8bb7656 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
index 18163bcb2a51c374e7160d37460cced85a4e2a7e..a5c6150f4735beb9f9d3ac66cb67bf61db5b1888 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view.xml
@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
@@ -87,7 +87,7 @@
</value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_stop_date</string>
@@ -96,7 +96,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_id</string>
@@ -105,7 +105,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_symbol</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml
index 6db439f757cd3fe21881ac13882d7c3ee3002459..486ed5d627cfb112032319a95134c16e2de7da15 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_start_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml
index 7ca187e52d83c656b4c364a54d54af184527dd58..4a79751d72ada7209feb25c27101d2faad471689 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox_stop_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
index 5207e02c26b583d67af46f1ab48f0b5291ccc4fc..7462b769f024a87d25e79a3502ad9e51e28577c8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -85,7 +85,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml
index 62281bc684092681b2e512849285752832f72a35..447b6a7df74b7157c3b08f876045da885ae0ce63 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/File_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -94,7 +94,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_file</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
index c015be38a5ec3fa5ea1ccd81c5fcd1f30f7fb7f6..36f1dd8f4cc7d0852fb243af25b04a4415fbc2b0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_id</string>
@@ -95,7 +95,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_street_address</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml
index 0549f8d5cb34ab574b0a5c8e0307c7ee51345ed0..dc2bb121c7edf65f65801a8681de8c050cd1af42 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -94,7 +94,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_file</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
index 35dc1d0f9335085582f90e803a26c07e422d6f5b..1715632108e95791ff167a207170c9b104482829 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>image_view</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
index 84add085145c287e7de4d8d35dd4b2021d3026eb..775ebbbdb9eea3580462adb1c955d46ab6239ba5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
index e6a03ab481b25d5c5082749df57b8e2c799b405d..3cb623f1c23a2950b4e617e4cac4c076b26fd6cd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_Title</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_Description</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_edit.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_edit.xml
index 0c1ed8af931d4e6a907833873afd20741e5e4a3b..569726f6b7ddfa640284010f4a7b484af4b5ca4c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_edit.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_edit.xml
@@ -106,7 +106,9 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/Organisation_edit</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
@@ -142,7 +144,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<string>ValidationError</string>
<string>FormValidationError</string>
<string>_getattr_</string>
-<string>context</string>
+ <string>context</string>
<string>request</string>
<string>validation_errors</string>
<string>field_errors</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
index 791beac82bb33c85ccec66687a46a734e5266109..9b13d34f2e1cdb12ff408175c2c2d3bb517f8594 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
@@ -87,7 +87,7 @@
</value>
</item>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -95,7 +95,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -110,7 +110,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_default_email_text</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
index 4e590d0cd8b9ae20df3c1eea4433863daa363571..b2b28a2a6641fdeb2a8f1fa7df095f4e80d0ede9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>contact_list</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList/contact_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList/contact_list.xml
index 257204cc1ad807abc54b553041b3701b6140441f..8da0c92cd3d1af9f486b2004c32d843d273d5565 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList/contact_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList/contact_list.xml
@@ -330,15 +330,15 @@
<value>
<list>
<tuple>
-<string>id</string>
-<string>id</string>
+ <string>id</string>
+ <string>id</string>
</tuple>
<tuple>
-<string>title</string>
+ <string>title</string>
<string>Title</string>
</tuple>
<tuple>
-<string>description</string>
+ <string>description</string>
<string>Description</string>
</tuple>
</list>
@@ -357,15 +357,15 @@
<value>
<list>
<tuple>
-<string>id</string>
+ <string>id</string>
<string encoding="base64">Jyc=</string>
</tuple>
<tuple>
-<string>title</string>
+ <string>title</string>
<string encoding="base64">Jyc=</string>
</tuple>
<tuple>
-<string>description</string>
+ <string>description</string>
<string encoding="base64">Jyc=</string>
</tuple>
</list>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
index 6253f46d2ce236fb012796dc09d54931871dcba7..5c292f9398a329dc41c27a3774289833371c92f3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>coordinate_list</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList/coordinate_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList/coordinate_list.xml
index 0f5b7a8809779568c3925284807a6413f997495a..a4327e40bf70123f3436ce2d0fbc1435a1698dd1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList/coordinate_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList/coordinate_list.xml
@@ -334,11 +334,11 @@
<value>
<list>
<tuple>
-<string>id</string>
-<string>id</string>
+ <string>id</string>
+ <string>id</string>
</tuple>
<tuple>
-<string>title</string>
+ <string>title</string>
<string>Title</string>
</tuple>
<tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
index ad83d3434a1b9487172a6747b25134681581c1e3..942e7a4b141b7d7bc9b1522501ce2e06d129fcc5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
@@ -87,7 +87,7 @@
</value>
</item>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_economical_class</string>
@@ -96,7 +96,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_social_form</string>
@@ -111,7 +111,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_destination_section_title</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_creation_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_creation_date.xml
index aed4e6b2b5f1d2d336a4287e0f7bf9735bdee70b..598b7eb13e70cf9529eb2f695389f9d9327ca3ac 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_creation_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/my_creation_date.xml
@@ -397,28 +397,28 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>date</string> </key>
+ <key> <string>date</string> </key>
<value>
<list>
-<string>year</string>
-<string>month</string>
-<string>day</string>
+ <string>year</string>
+ <string>month</string>
+ <string>day</string>
</list>
</value>
</item>
<item>
- <key> <string>time</string> </key>
+ <key> <string>time</string> </key>
<value>
<list>
-<string>hour</string>
-<string>minute</string>
-<string>ampm</string>
+ <string>hour</string>
+ <string>minute</string>
+ <string>ampm</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
index d4ecc060f4f391962efa09758bbb11ee990f0f15..d21b45b08bf8dc341b17ef967c9a9b55e9b369d7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchDialog.xml
index 7dedfab7db106d925d8a249241300bd544be7eba..d97c0175d6358b895717fc588799e8e886fda37d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchDialog.xml
@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_Title</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_Description</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchEmailDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchEmailDialog.xml
index 5e32ba104e492b984cf3fafbc1761eb38e6ca802..a913b1436417cc2b5eb3aaf7d1b4c9be7ece33ea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchEmailDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchEmailDialog.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_role</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchPhoneDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchPhoneDialog.xml
index b49840900403d68eeb341e927545154303fd6e59..b01a065288de17ba462a8568ac3faadfb8e11ead 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchPhoneDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewSearchPhoneDialog.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
index fce6b6d312b3a20748c3c7576fb9e72a17bbcf35..1b30b762c8fbff3135dba1fbe744d3c38d643c5d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
@@ -87,6 +87,12 @@ context.setReference(None)\n
<none/>
</value>
</item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_exchange.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_exchange.xml
index f5a3279facaf01158d8419cf5b6884d111901ede..017ccc9cf8ebcd88ecc375e9710d323d762daa20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_exchange.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_exchange.xml
@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -87,7 +87,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_description</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
index 14f127020220f3bf225348e36416f3ddeefab7b4..f762eefa50b746b683ae1df50d13fba7e47e8e29 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
@@ -127,7 +127,9 @@ user_folder.setGroupsOfUser(security_group_list, user_name)\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/Person_updateUserSecurityGroup</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
index 995e05a4699e3f608c89104c19d7aef0e235b465..d34ca6d8dd4d6c9c1370e9f9902bd581732435d0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
@@ -87,7 +87,9 @@ return 0\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/erp5_base/Person_validatePasswordsMatch</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
index f5875650afe7b667f7af0c3b3aebbe7814de55ff..c4b9cde983a5af3e53a9710d8d3c6ac49047d74f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile.xml
index 38d1713b8eb71d57a839ae835e21afb97aa18bde..44d2141570db2ceea304e29ebbf9732390daa73f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -97,7 +97,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_career_skill_list</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewReport.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewReport.xml
index 97ea65281e8fafa15778f8c8b6689249ca23dd23..ac7a5eae0d1045e6edaafce25464d839f2c89af2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewReport.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewReport.xml
@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_description</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
index 95c73e3f969060d28537dd51b0ec6f58f6c6c146..c0f3265746151514096400b980244911a2b13765 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_id</string>
@@ -95,7 +95,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_telephone_country</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
index 655946848fbe1427329a779e30c8de0b64602422..1cfd7f70e20a3daa5ea74c688a2c377cebe9e807 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -95,7 +95,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>link</string>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
index ced085c4b916115562bcb08437effc152fadbc5f..f4106d91b3288428444ba30c523e0c43a40adf36 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency.xml
@@ -104,7 +104,9 @@ if len(assignment_site_list) != 1:\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/baobab/portal_workflow/assignment_workflow/scripts/Assignment_checkActiveAssignmentConsistency</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_params</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
index fc3d5c34addac2996ca3681b089c98375d69bc73..e19b6b02d0e1b8d1a68c21651de1059e41f831d9 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup.xml
@@ -91,7 +91,9 @@ if person_security_script is not None:\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/nexedi/portal_workflow/assignment_workflow/scripts/Assignment_updateUserSecurityGroup</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_owner</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
index 0948b4df561dfabb1dfc9a0d802e0a194265982f..7f2dfb0cdb7f6677dbe6310cd309abcf906e0bea 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
@@ -98,7 +98,9 @@ if len(active_careers) > 0:\n
</item>
<item>
<key> <string>_filepath</string> </key>
- <value> <string>Script (Python):/baobab/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>_params</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml
index 2f24ebd3e4dfde314f1d8aa6a52e90c327f54c7d..82d0539fdbe2c84b30e5d06c388d5bc30a539554 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml
@@ -134,7 +134,7 @@ if cell_range_key_list != [[None, None]] :\n
<string>state_change</string>
<string>kw</string>
<string>_getattr_</string>
-<string>context</string>
+ <string>context</string>
<string>base_id</string>
<string>kwd</string>
<string>cell_range_key_list</string>
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index 6d8201ba5793e25a25576f8c1561b2733a802d5f..254cffe9ce9e37e970495361f8025d249825be05 100644
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,3 +1,6 @@
+2006-08-28 Romain
+* Remove gender's paths
+
2006-06-30 aurel
* add overdraft facility field on bank account
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 9a037142aa3c1b4c490e1a38251620f113465330..8e2afd342773582f9484b796cdc0b84736e8194e 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-10
\ No newline at end of file
+17
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_path_list b/bt5/erp5_base/bt/template_path_list
index 347cf94f262fbef3c27b8f8720ce62d4bd9d4b49..3a3b129fc04c8493295b3a6a2a7be712e48da6eb 100644
--- a/bt5/erp5_base/bt/template_path_list
+++ b/bt5/erp5_base/bt/template_path_list
@@ -1,3 +1 @@
-portal_categories/gender/female
-portal_categories/gender/male
portal_categories/role/internal
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_preference_list b/bt5/erp5_base/bt/template_preference_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391