diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/history.xml
index e2856b9771be8a11756ca9486fab923c74b842fe..6ddff8ee357c34d576466248a979e3cf45360dbd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/metadata.xml
index 94e56f7335aa2a6aa038952ce39865039f100000..f4f1655d615fd25d4333934b6ef806aa89131b50 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print.xml
index 28fd457103b32cd0819968bcbf25d543c02352c4..35bc8eb2e92ca5fb278c043fb19d499f3cabb1ea 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print_pdf.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print_pdf.xml
index c92cef8fde2aef8c68ed575d6d448ac06e44fb89..68c05125181402764779a623f109cee4b0ad14b4 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print_pdf.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/print_pdf.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print_pdf</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
index 0fd5df4c9b0de67d0eaf277fd381f6a7d59524d2..4352a40f7deb67070d9e00d3ac1fe44111624f7a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Address/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
index b6c47d25b0ce57314cbb483fb3d677fb5ade1a36..d54a254eb99329e073abd0a8dedeb3c8d5ee6a1d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
index 2aa4a6dcd43651422c6becc1fd7cb127e5076ae0..273fb9cb9cfe80ecf7107ed76c0998b77603519e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
index 7f2a3fa788cd8416177e703544dce4e46b43adbe..2520bd4c098a20b949631bd1b7e36e9fae57d574 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
index 58cb407b74625ca4c0a9eede9bf179485b650b96..a0b261a5e06139228233bb59c1b6c603d30d36d3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -62,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
index 2804403bee1357006fb3353fc59c896e5ed2e555..d330836405afd00f820ee1b9f285fcb7907ede66 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>download</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
index 717a9f2d32a08e4d26434856343bee42382cf7cf..fedfa8a0858eea88c45e81664125f38268f64dc5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/import.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>import</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
index bf77cba973cdf7f24d2c244fc5c7204db14cef8d..00d0d7c79ac4d203cea39e3766e39ca4b2058192 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/signature.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>signature</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
index 0a90315c11a490f49a733ef5c8213dc392758e59..18814ae24c234ce0da299a5aaa97cffc70c2c764 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/history.xml
index c8ba1cc1c5542973ca862555037e15f84bfabfdd..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/history.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/metadata.xml
index 8921c12faeff43db6e44818d83d82c4008f3abc6..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/metadata.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/print_pdf.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
index 2464f8eb04e04f1887740a83949ca8f23ccf12a7..b0419eaa7a9807479b68249d675e5076e7a9d336 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>print_pdf</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
index 2c57b228feba7dd9b028a1855650786285362dbd..aa34e43fe00f82723f78e2f6682c776f3fcf9d31 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Assignment/view.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
index efe89b094a675b86f0ff42268b452119190922ca..0b1079924591208dc4f5a4dbcbf1a93e68934b04 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
@@ -46,10 +46,6 @@
             <key> <string>id</string> </key>
             <value> <string>jump_active_accounting_pref</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
index 49204d9eb5028ff9a804ddcfda82983369008c71..301db8a8b5f8f820d52cd63951278c90ff8b88d2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print_pdf</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
index b1be1189fe2e7fc2c669765e4c834e85ddb4c50e..3854be091c0738f230990df9ffc07c1e04e2e32c 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Bank%20Account/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/history.xml
index b6c47d25b0ce57314cbb483fb3d677fb5ade1a36..d54a254eb99329e073abd0a8dedeb3c8d5ee6a1d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/metadata.xml
index 2aa4a6dcd43651422c6becc1fd7cb127e5076ae0..273fb9cb9cfe80ecf7107ed76c0998b77603519e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/print_pdf.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/print_pdf.xml
index 4291f7d5f4901bed1f92564cc2cb1030d05e385c..405c2d495c927aad1bbbd8cde4a4c0c96052cbd1 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/print_pdf.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/print_pdf.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print_pdf</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
index bff37325948b297ffeddfab1c2a60764184fe3d8..02015758bb85d8373a3de83fbe117c39eade674e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Career/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/view.xml
index fc769d8d949cd9eaf9b64016c1072e8452db2218..f7ae0ec876134a90b180c90e70b66c6b9617f6c2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/ChatAddress/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/history.xml
index b6c47d25b0ce57314cbb483fb3d677fb5ade1a36..d54a254eb99329e073abd0a8dedeb3c8d5ee6a1d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
index 2aa4a6dcd43651422c6becc1fd7cb127e5076ae0..273fb9cb9cfe80ecf7107ed76c0998b77603519e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
index 16d9e6d75032a3579db4086d7a4b132848ed01c2..aed67763f7d2a4c1ae97c262c9257452d1a0d3f6 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print_pdf</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
index 9ac8b87d144530d94e60e01c22e1491f112c2b45..84272e57011cab3049ae6e0d3d2574df9ac26d82 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Credit%20Card/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
index 7a5ec5e611dc394a14679add19e208c2f1fe861c..8597f83c22f2845d457b54fdaac6e530b4aa631b 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
index 7b891294e9e07268f2bea2c5c5679754cde8d9fa..df3dee79648835fe1d78dd61202cffbc4579fad4 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>csv_export</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
index 053f01c787fb0efe5166a94a7c3705aad8846349..7b41ddea3f502051d3c4c437f179cabd2b770c9a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>csv_import</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/print.xml
index 75d89da833af8b7e539ec4b17730315b786ac34d..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/print.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/search.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/search.xml
index f3b7e83aa673cd4b0169651e4fea4fc10db27f3d..1d6ce9a644787d8c0ba284b32548850a70804303 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/search.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/search.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>search</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
index eabad5f5e8c877ed4c6b98fe2b14bf0290d387ee..a82e04907d0d193a29365ce765f459693e41b79e 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency%20Module/view.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
index c984c92dad793888e76f7dbb4b3d3b313c3ef931..51cbf981a89319a213b3a8a888d7f241d9bb6ab5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Currency/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/history.xml
index 8a72e4e09d1fb5085e07f1680413a2c1cde7784a..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
index 6f5386c339aaeb79aeef44248111e47dca5afaf0..6215aebdcf55abd19ef78f0d26fe30787501ca10 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Email/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/fax.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/fax.xml
index 6e59f951a24ed9695dca6a396aa83763dd0632aa..a802b130eb1f12077df22fc1bef4f6c72f6be8f3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/fax.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/fax.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>fax</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/history.xml
index da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e..7967a23223e15447736cd7ebae02207110249870 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/metadata.xml
index d38a393f380a02ec9af38b7972b7325373140b83..919165fa3eaf7050e0e17fa951b4c1d7585a0433 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/previous_call.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/previous_call.xml
index 7b63378edc23f98d775f849097c9fc4b4f5f40e2..d0d821c60fa27d18cf7707f35065027e241aabb2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/previous_call.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/previous_call.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>previous_call</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
index c2976d53379b1cf9da6030ff8ce9603643b2717d..1f4c4557a21565ea4038711563705a88e1cb67c8 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Fax/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
index 10443a04b1dc601a15778783d8c577e2d5677255..a793c6cd50f3ff948492bc1118864c393acd887a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/download.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>download</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/history.xml
index e2856b9771be8a11756ca9486fab923c74b842fe..6ddff8ee357c34d576466248a979e3cf45360dbd 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/metadata.xml
index 94e56f7335aa2a6aa038952ce39865039f100000..f4f1655d615fd25d4333934b6ef806aa89131b50 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
index 81ab387fa6f8bfd284b6ba4625c5ab5ea4587b5e..f0fbf051d8400583f6b04386014c025ecf489a31 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/File/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
index e0f0092a90babc3a667734824cb07199324b4f55..993ec0cab7ca942a29f1e3c18140fbfbf42e7e46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/download.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>download</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
index 2af2ecdb1a4dd5d33c414f0c6df89c1f77380a57..e3589d974ee800df57f8539d07b8882b9d3e1591 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/fullsize_view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>fullsize_view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/history.xml
index da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e..7967a23223e15447736cd7ebae02207110249870 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/metadata.xml
index d38a393f380a02ec9af38b7972b7325373140b83..919165fa3eaf7050e0e17fa951b4c1d7585a0433 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/print.xml
index 21ff1c80053d5443d69b4a553a05d8b08dcbdade..65501c0a4550f3b81fe7f05a19c3dd0b74115dfe 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
index aafc9c62c72d243f7e4678e98f88ff45763544bd..a090fcb25138c43ec3409d835e8cc2d53119710f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Image/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/history.xml
index ee2038fea2860a2cf49ad26aa853d936bd8ff8bd..20592e1ec83760d69031b87f0d0d236dc10a68b5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/metadata.xml
index b9b9087faf09033846349b8ecc8c7c5e4b4c6729..bb0ddd9d25acbe62d39df19c74ff6fa819a86249 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
index 82e8742df00303c28d5dc1520cc700f98426b87b..f7ae0ec876134a90b180c90e70b66c6b9617f6c2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Link/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
@@ -62,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
index 171c2e1854688fd2e765849b3b9ca22dbfefe5a4..37e58376c2ac79ba636714c27d609fcabd210d29 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>csv_export</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
index ebc1b4273f611a242a980a59e91268848bc02f86..0416b51bc6c495a12951c371f9fdf222f35a5c65 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>csv_import</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
index af4ea8ec04ea3aa18061d62a4bd4586a22dc385a..4e65edbd7bf95374e16150dec81eb852b9c1997d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>list_ui</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/search.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
index 4f26843741967b18cd85c0c61b6e8073df9a6189..5136599ebe6c8accafcbd8d536d13423796ab8ed 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>search</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
index 1782a95b62c77538a160e97c694a5221914246cf..8a91a867b9f7d4b180ee81ee5807ee0de17144da 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>sort_on</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
index 87b49b60600baaa7d81140210f47bf6721c02978..7f35bde1e9ef15bf03b6f04d8d7fd82e3ab0b6a3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/coordinates.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/coordinates.xml
index 77099c56890a7091cc0f8a26e30ecd1913cdb4d6..ceaf3cb145b098f2d2339444177aaf8f6fa097f8 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/coordinates.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/coordinates.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>coordinates</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
index 3a335b778d8d216e4712b57c2ea5c60522a44938..23880b1352c964ebc79c550e8cab82482dbf3654 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/details.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml
index b0d7cd71697c09cfe3770134aac4266a7ef6550d..e8e3f8d4d808614811eae0b3e8f8c107d9966703 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/document_view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>document_view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
index d81b862797afa4cb8a6c77c49a5f817ad0e11e00..3bc11f10c162e9d9f4789e417c833046bbe1e196 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/financial_view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>financial_view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/history.xml
index a7a14d50a762c0fb33786c8279f7abce96b29b3e..8320cb99a1489899ee1d0becbcd74f0f3008f4a4 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/list.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/list.xml
index 46deb580ca9416c5d43ce8cc9e95a5bb231ee3fa..7de1635649a8acdd57f107fb94511bb061b70ad7 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/list.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/list.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>list</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/metadata.xml
index a445465cbbd28e90ec00e9662dc6a17bdd51de92..c8c0aa78f78fe6e942a224a4b7dae3e2baefde2d 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
index 7ce9d664c3492f3fff2234a316b051b7e1186fcc..bdea974d22e7f63a0091769a5fbbb03ef4a769fc 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Organisation/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
index cb2abd5926ed32d9052ed09351e2e360d064f214..447bea2690ebeea5cbe0f2f55a8611b2757a27a2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/assignment.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>assignment</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/career.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/career.xml
index 89981cc1f5d3b82bdd37f15aa86e083293fc6d38..d4e8a19ebb8107b8aaf868051dbb0ee1296462d3 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/career.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/career.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>career</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
index 45d63ca83cc69d7f705ad93f98e835e07f3f0a19..b81303ec876fd765d0714469fd92c06467829fca 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/details.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>details</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml
index 1e253dbed55bcc3fef80f9a37322d2155cd6e9cc..4c3e8225444999f86025f01d8243db4b3980fb06 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/document_view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>document_view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/exchange.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/exchange.xml
index 9f616b61ed8713bdb09d32624b3076645f1b08fa..4750d32c984f41385516ee8b372bf9c82b945789 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/exchange.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/exchange.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>exchange</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
index ae5accae8be04dcfceb0eb12a4d2d20aedb2e77a..8bf434d85a6b30867c4d8a4a2a18756413d4473a 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/financial_view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>financial_view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/history.xml
index fc88662d7a4c129fad219f9484af20e07b335211..d4bab4796508cb53fd82943ec2947e8799fa0f1c 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/history.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/metadata.xml
index 81a7a42e90f6351c7b6f78e527d1580f6787aeed..774305198840e25498a66c416155e1d8ca09d724 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/metadata.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/print.xml
index c081e6af620b304ca0e65bb79e472a329dddb123..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/print.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/profile.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/profile.xml
index a6598611ff09dddf7eb52028d448c8129715fad6..2589fb2ca8d2f6a0d4eeae0623859a08179c14bb 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/profile.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/profile.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>profile</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
index daae6947dc0438b15bc5c4d8f3bcbfc54af8ad25..6998157893abb7fd555a88abd35c79744e6ce308 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/report.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>report</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml
index 7f419e34be1751530ded84664f98eef2114b8d53..7be2d508d2d731f67fb1ad85a43b8070d2acedf5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/terminate_career.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>terminate_career</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
index f5145c6b3e00a8978730c849724ef2451ef88e04..e75feaeae991be4e1d186bfca7363cbb53cd4167 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Person/view.xml
@@ -44,10 +44,6 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/call.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/call.xml
index 9b10463d788074018fa27bfecaf26d65a17e2a77..e26769b3f5cc10835e5e53511c2dc264352282f5 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/call.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/call.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>call</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/history.xml
index c8ba1cc1c5542973ca862555037e15f84bfabfdd..2e6965f16789166a478e54992734f55e58425c46 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/history.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/metadata.xml
index 8921c12faeff43db6e44818d83d82c4008f3abc6..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/metadata.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/previous_call.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/previous_call.xml
index a2e98bbf1b240f0d1d88e0e62f28a6ebe37b0325..aaa10ffab5cc7c0bbe3ce3e8f68f729a4590ddd2 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/previous_call.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/previous_call.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>previous_call</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/print.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/print.xml
index 75d89da833af8b7e539ec4b17730315b786ac34d..a1393d87681adcc916710c07d355ff87dc1f161f 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/print.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/print.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
index 12d11dc59dd6b87e2d104a990eabb469087d7ede..1f4c4557a21565ea4038711563705a88e1cb67c8 100644
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Telephone/view.xml
@@ -36,6 +36,10 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
index f0055b77e2c593f3c50e6c36f5feaed3a95ab703..1ee81ec3acc216b2563b679fad2db6592f1a840b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>agent</string> </value>
+            <value> <string>agent</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
index 13e2ca4b1012b9237a7e2dedba35270c8a347690..adf14cb79c7315722b8cdf3e086545ecd5a14dc1 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>agent_privilege</string> </value>
+            <value> <string>agent_privilege</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
index 06795e593367c7a0d12027490d5be201e98da394..48c7dd2d869c8c9cc23829c0c6458a2483ad1460 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>currency_exchange_type</string> </value>
+            <value> <string>currency_exchange_type</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
index c45e92c264d012e08f5df4012c2f1f9dfd65ebcc..1bb983addcf5bc925750f97309303ffd212aaafd 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
@@ -57,7 +57,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>economical_class</string> </value>
+            <value> <string>economical_class</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
index 8f5e5436045a87b73f3af08d96d9572bc6f3291e..b2fe53bd16db2727a37b5d120d5ec8c857a33f03 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
@@ -30,6 +30,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_properties</string> </key>
             <value>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
index d1ba081eafb66c4f3c58b319e10ee3fd0d07bc21..832e86f81b8bf88738a694e7d53fe61a4b01545b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
@@ -61,7 +61,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>insurance_coverage</string> </value>
+            <value> <string>insurance_coverage</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
index d894e8c349e1e3b423fb1dd300ad1b2fb22b3093..e0c43cd1b53827cea0f7b526ed3b1e30f72495d2 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>legal_parent</string> </value>
+            <value> <string>legal_parent</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
index 9dccc12b0ab01c3fae8c1ced0666da8a43b1a52c..2dc592d0a51a113681b8f20b4c05d957d3f7fef4 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
@@ -62,7 +62,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>marital_status</string> </value>
+            <value> <string>marital_status</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
index 75c6f062fdabef0c863b4b2305a7e7a2b15d3d59..0fb0ff97262a6de2aa78fc69d8a65f20c69f2f93 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>natural_parent</string> </value>
+            <value> <string>natural_parent</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
index f4b57ee6ff0f194cb04b868e884ac5be271d1a60..33b8064b204056c56e43ce1db32ffa2e64280d91 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
@@ -70,7 +70,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>price_currency</string> </value>
+            <value> <string>price_currency</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
index 39fc990a0d71b8d9e31a568242f39732e8f5e890..640b775362997bd4cf863836d0f709fcbdcfcc74 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
@@ -441,12 +441,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_history</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
@@ -490,152 +484,4 @@
       <none/>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>edit_workflow</string> </key>
-                    <value>
-                      <tuple>
-                        <dictionary>
-                          <item>
-                              <key> <string>action</string> </key>
-                              <value> <string>\'edit\'</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>actor</string> </key>
-                              <value> <string>zope</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>comment</string> </key>
-                              <value> <string>Object copied from /nexedi/portal_workflow/order_workflow</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>state</string> </key>
-                              <value> <string>current</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>time</string> </key>
-                              <value>
-                                <object>
-                                  <klass>
-                                    <global name="DateTime" module="DateTime.DateTime"/>
-                                  </klass>
-                                  <tuple>
-                                    <none/>
-                                  </tuple>
-                                  <state>
-                                    <dictionary>
-                                      <item>
-                                          <key> <string>_aday</string> </key>
-                                          <value> <string>Fri</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_amon</string> </key>
-                                          <value> <string>Jun</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_d</string> </key>
-                                          <value> <float>38160.4030506</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_day</string> </key>
-                                          <value> <int>24</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_dayoffset</string> </key>
-                                          <value> <int>5</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fday</string> </key>
-                                          <value> <string>Friday</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fmon</string> </key>
-                                          <value> <string>June</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_hour</string> </key>
-                                          <value> <int>5</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_millis</string> </key>
-                                          <value> <long>1119606023569</long> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_minute</string> </key>
-                                          <value> <int>40</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_month</string> </key>
-                                          <value> <int>6</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_nearsec</string> </key>
-                                          <value> <float>23.0</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pday</string> </key>
-                                          <value> <string>Fri.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pm</string> </key>
-                                          <value> <string>am</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmhour</string> </key>
-                                          <value> <int>5</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmon</string> </key>
-                                          <value> <string>June</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_second</string> </key>
-                                          <value> <float>23.569</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_t</string> </key>
-                                          <value> <float>1119606023.57</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_tz</string> </key>
-                                          <value> <string>GMT-4</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_year</string> </key>
-                                          <value> <int>2005</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>time</string> </key>
-                                          <value> <float>0.403050567133</float> </value>
-                                      </item>
-                                    </dictionary>
-                                  </state>
-                                </object>
-                              </value>
-                          </item>
-                        </dictionary>
-                      </tuple>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
index 77f6c9fdb5cc681c5f3b409336953fc964b0eb61..759e2f569caeb60ba9e5110fecb6b3207dfeea52 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
@@ -70,7 +70,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>salary_level</string> </value>
+            <value> <string>salary_level</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
index 1d7c70c6d1d487465e7a1a8dfb29715350d59cca..4bfc49b7d5edbef8deba8dd5f54f9b3263de1fcc 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
@@ -70,7 +70,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>site</string> </value>
+            <value> <string>site</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml
index 843e55b89c624646869f9a1dcd4a3bbbc774657a..499c28e1ba51964b995f550ce182d0e15fec5c54 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/female.xml
@@ -70,12 +70,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_history</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml
index 9350894b01ab7a6c7b66c82441647455b5fb95ce..c3db49b13b1decfd8935f58dd8a6010bd11a5df0 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/gender/male.xml
@@ -70,12 +70,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_history</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
index c99ef46047a4497236c8af85c52a4966a1c3a658..5f85b779f85696948bdfcfea0c70e6aba57b62fe 100644
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
@@ -68,12 +68,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_history</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
@@ -117,386 +111,4 @@
       <none/>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>edit_workflow</string> </key>
-                    <value>
-                      <tuple>
-                        <dictionary>
-                          <item>
-                              <key> <string>action</string> </key>
-                              <value> <string>\'edit\'</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>actor</string> </key>
-                              <value> <string>kevin</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>comment</string> </key>
-                              <value> <string></string> </value>
-                          </item>
-                          <item>
-                              <key> <string>state</string> </key>
-                              <value> <string>current</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>time</string> </key>
-                              <value>
-                                <object>
-                                  <klass>
-                                    <global id="5.1" name="DateTime" module="DateTime.DateTime"/>
-                                  </klass>
-                                  <tuple>
-                                    <none/>
-                                  </tuple>
-                                  <state>
-                                    <dictionary>
-                                      <item>
-                                          <key> <string>_aday</string> </key>
-                                          <value> <string>Wed</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_amon</string> </key>
-                                          <value> <string>Aug</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_d</string> </key>
-                                          <value> <float>38207.7129787</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_day</string> </key>
-                                          <value> <int>10</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_dayoffset</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fday</string> </key>
-                                          <value> <string>Wednesday</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fmon</string> </key>
-                                          <value> <string>August</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_hour</string> </key>
-                                          <value> <int>13</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_millis</string> </key>
-                                          <value> <long>1123693601360</long> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_minute</string> </key>
-                                          <value> <int>6</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_month</string> </key>
-                                          <value> <int>8</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_nearsec</string> </key>
-                                          <value> <float>41.0</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pday</string> </key>
-                                          <value> <string>Wed.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pm</string> </key>
-                                          <value> <string>pm</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmhour</string> </key>
-                                          <value> <int>1</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmon</string> </key>
-                                          <value> <string>Aug.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_second</string> </key>
-                                          <value> <float>41.36</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_t</string> </key>
-                                          <value> <float>1123693601.36</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_tz</string> </key>
-                                          <value> <string>GMT-4</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_year</string> </key>
-                                          <value> <int>2005</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>time</string> </key>
-                                          <value> <float>0.712978703697</float> </value>
-                                      </item>
-                                    </dictionary>
-                                  </state>
-                                </object>
-                              </value>
-                          </item>
-                        </dictionary>
-                        <dictionary>
-                          <item>
-                              <key> <string>action</string> </key>
-                              <value> <string>\'edit\'</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>actor</string> </key>
-                              <value> <string>kevin</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>comment</string> </key>
-                              <value> <string></string> </value>
-                          </item>
-                          <item>
-                              <key> <string>state</string> </key>
-                              <value> <string>current</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>time</string> </key>
-                              <value>
-                                <object>
-                                  <klass> <reference id="5.1"/> </klass>
-                                  <tuple>
-                                    <none/>
-                                  </tuple>
-                                  <state>
-                                    <dictionary>
-                                      <item>
-                                          <key> <string>_aday</string> </key>
-                                          <value> <string>Wed</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_amon</string> </key>
-                                          <value> <string>Aug</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_d</string> </key>
-                                          <value> <float>38228.8073947</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_day</string> </key>
-                                          <value> <int>31</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_dayoffset</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fday</string> </key>
-                                          <value> <string>Wednesday</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fmon</string> </key>
-                                          <value> <string>August</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_hour</string> </key>
-                                          <value> <int>15</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_millis</string> </key>
-                                          <value> <long>1125516158903</long> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_minute</string> </key>
-                                          <value> <int>22</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_month</string> </key>
-                                          <value> <int>8</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_nearsec</string> </key>
-                                          <value> <float>38.0</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pday</string> </key>
-                                          <value> <string>Wed.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pm</string> </key>
-                                          <value> <string>pm</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmhour</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmon</string> </key>
-                                          <value> <string>Aug.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_second</string> </key>
-                                          <value> <float>38.903</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_t</string> </key>
-                                          <value> <float>1125516158.9</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_tz</string> </key>
-                                          <value> <string>GMT-4</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_year</string> </key>
-                                          <value> <int>2005</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>time</string> </key>
-                                          <value> <float>0.807394710646</float> </value>
-                                      </item>
-                                    </dictionary>
-                                  </state>
-                                </object>
-                              </value>
-                          </item>
-                        </dictionary>
-                        <dictionary>
-                          <item>
-                              <key> <string>action</string> </key>
-                              <value> <string>\'edit\'</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>actor</string> </key>
-                              <value> <string>jp</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>comment</string> </key>
-                              <value> <string></string> </value>
-                          </item>
-                          <item>
-                              <key> <string>state</string> </key>
-                              <value> <string>current</string> </value>
-                          </item>
-                          <item>
-                              <key> <string>time</string> </key>
-                              <value>
-                                <object>
-                                  <klass> <reference id="5.1"/> </klass>
-                                  <tuple>
-                                    <none/>
-                                  </tuple>
-                                  <state>
-                                    <dictionary>
-                                      <item>
-                                          <key> <string>_aday</string> </key>
-                                          <value> <string>Wed</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_amon</string> </key>
-                                          <value> <string>Mar</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_d</string> </key>
-                                          <value> <float>38417.8542372</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_day</string> </key>
-                                          <value> <int>8</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_dayoffset</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fday</string> </key>
-                                          <value> <string>Wednesday</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_fmon</string> </key>
-                                          <value> <string>March</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_hour</string> </key>
-                                          <value> <int>15</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_millis</string> </key>
-                                          <value> <long>1141849806091</long> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_minute</string> </key>
-                                          <value> <int>30</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_month</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_nearsec</string> </key>
-                                          <value> <float>6.0</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pday</string> </key>
-                                          <value> <string>Wed.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pm</string> </key>
-                                          <value> <string>pm</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmhour</string> </key>
-                                          <value> <int>3</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_pmon</string> </key>
-                                          <value> <string>Mar.</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_second</string> </key>
-                                          <value> <float>6.091</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_t</string> </key>
-                                          <value> <float>1141849806.09</float> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_tz</string> </key>
-                                          <value> <string>US/Eastern</string> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>_year</string> </key>
-                                          <value> <int>2006</int> </value>
-                                      </item>
-                                      <item>
-                                          <key> <string>time</string> </key>
-                                          <value> <float>0.854237164356</float> </value>
-                                      </item>
-                                    </dictionary>
-                                  </state>
-                                </object>
-                              </value>
-                          </item>
-                        </dictionary>
-                      </tuple>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>