diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
index 18ac8c2dae33937216fb132f7f31789567cc1a01..6c1a9f7291c5269ab1322bfeafc3bdc186265024 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
@@ -102,6 +102,7 @@
<value>
<list>
<string>my_default_email_coordinate_text</string>
+ <string>my_default_email_url_string</string>
<string>default_telephone</string>
<string>default_fax</string>
<string>my_default_address_street_address</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_coordinate_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_coordinate_text.xml
index 7962bd72cb8491116b029e11790cc2362313e3de..d09034c96c53e218c7e21d134932279265749634 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_coordinate_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_coordinate_text.xml
@@ -9,7 +9,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -50,6 +52,12 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -69,6 +77,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_email</string> </value>
@@ -87,4 +99,17 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: (here.hasDefaultEmail() and not here.getDefaultEmail().isDetailed()) or not here.hasDefaultEmail()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_url_string.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_url_string.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01c4aec9306d945a7b64cbc646959877c68a93b2
--- /dev/null
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_email_url_string.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_default_email_url_string</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_email_url_string</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewBaseFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getDefaultEmail().isDetailed()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml
index 15ab291d949f59e6e250b2ac07dba294f8e08536..22ad44e25456ebff1dc22592107a4f61fc3f1be7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view.xml
@@ -109,6 +109,7 @@
<value>
<list>
<string>my_default_email_coordinate_text</string>
+ <string>my_default_email_url_string</string>
<string>default_telephone</string>
<string>mobile_telephone</string>
<string>default_fax</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_coordinate_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_coordinate_text.xml
index 7962bd72cb8491116b029e11790cc2362313e3de..d09034c96c53e218c7e21d134932279265749634 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_coordinate_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_coordinate_text.xml
@@ -9,7 +9,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -50,6 +52,12 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -69,6 +77,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_email</string> </value>
@@ -87,4 +99,17 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: (here.hasDefaultEmail() and not here.getDefaultEmail().isDetailed()) or not here.hasDefaultEmail()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_url_string.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_url_string.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01c4aec9306d945a7b64cbc646959877c68a93b2
--- /dev/null
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_email_url_string.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_default_email_url_string</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_email_url_string</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewBaseFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getDefaultEmail().isDetailed()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index eeb072e53761eac26282343d7ace8d00f1250ca9..f03187e185cbf885da81b7fd15daac172b8d9399 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-997
+998
\ No newline at end of file