diff --git a/asterisk_click2dial/asterisk_click2dial.py b/asterisk_click2dial/asterisk_click2dial.py
index 5be18fe..125f910 100644
--- a/asterisk_click2dial/asterisk_click2dial.py
+++ b/asterisk_click2dial/asterisk_click2dial.py
@@ -347,7 +347,8 @@ class res_users(orm.Model):
             help="Caller ID used for the calls initiated by this user."),
         # You'd probably think: Asterisk should reuse the callerID of sip.conf!
         # But it cannot, cf
-        # http://lists.digium.com/pipermail/asterisk-users/2012-January/269787.html
+        # http://lists.digium.com/pipermail/asterisk-users/
+        # 2012-January/269787.html
         'cdraccount': fields.char(
             'CDR Account', size=50,
             help="Call Detail Record (CDR) account used for billing this "
diff --git a/base_phone/__openerp__.py b/base_phone/__openerp__.py
index 7c46812..67fcb24 100644
--- a/base_phone/__openerp__.py
+++ b/base_phone/__openerp__.py
@@ -77,6 +77,7 @@ for any help or question about this module.
         ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': ['base_phone_demo.xml'],
+    'test': ['test/phonenum.yml'],
     'images': [],
     'installable': True,
 }
diff --git a/base_phone/base_phone.py b/base_phone/base_phone.py
index 91309d7..51a70ee 100644
--- a/base_phone/base_phone.py
+++ b/base_phone/base_phone.py
@@ -63,6 +63,8 @@ class phone_common(orm.AbstractModel):
     def _generic_reformat_phonenumbers(self, cr, uid, vals, phonefields=None,
                                        context=None):
         """Reformat phone numbers in E.164 format i.e. +33141981242"""
+        if context is None:
+            context = {}
         if phonefields is None:
             phonefields = [
                 'phone', 'partner_phone', 'work_phone', 'fax',
@@ -89,6 +91,12 @@ class phone_common(orm.AbstractModel):
                     try:
                         res_parse = phonenumbers.parse(
                             vals.get(field), user_countrycode)
+                        vals[field] = phonenumbers.format_number(
+                            res_parse, phonenumbers.PhoneNumberFormat.E164)
+                        if init_value != vals[field]:
+                            _logger.info(
+                                "%s initial value: '%s' updated value: '%s'"
+                                % (field, init_value, vals[field]))
                     except Exception, e:
                         # I do BOTH logger and raise, because:
                         # raise is usefull when the record is created/written
@@ -96,19 +104,14 @@ class phone_common(orm.AbstractModel):
                         # logger is usefull when the record is created/written
                         #    via the webservices
                         _logger.error(
-                            "Cannot reformat the phone number %s to "
+                            "Cannot reformat the phone number '%s' to "
                             "international format" % vals.get(field))
-                        raise orm.except_orm(
-                            _('Error:'),
-                            _("Cannot reformat the phone number '%s' to "
-                                "international format. Error message: %s")
-                            % (vals.get(field), e))
-                    vals[field] = phonenumbers.format_number(
-                        res_parse, phonenumbers.PhoneNumberFormat.E164)
-                    if init_value != vals[field]:
-                        _logger.info(
-                            "%s initial value: '%s' updated value: '%s'"
-                            % (field, init_value, vals[field]))
+                        if context.get('raise_if_phone_parse_fails'):
+                            raise orm.except_orm(
+                                _('Error:'),
+                                _("Cannot reformat the phone number '%s' to "
+                                    "international format. Error message: %s")
+                                % (vals.get(field), e))
         return vals
 
     def get_name_from_phone_number(
diff --git a/base_phone/res_partner_view.xml b/base_phone/res_partner_view.xml
index fdc1996..28bf5e5 100644
--- a/base_phone/res_partner_view.xml
+++ b/base_phone/res_partner_view.xml
@@ -56,5 +56,9 @@
     </field>
 </record>
 
+<record id="base.action_partner_form" model="ir.actions.act_window">
+    <field name="context">{'search_default_customer':1, 'raise_if_phone_parse_fails': True}</field>
+</record>
+
 </data>
 </openerp>
diff --git a/base_phone/static/src/js/phone_widget.js b/base_phone/static/src/js/phone_widget.js
index 07f358d..478a30f 100644
--- a/base_phone/static/src/js/phone_widget.js
+++ b/base_phone/static/src/js/phone_widget.js
@@ -27,9 +27,15 @@ openerp.base_phone = function (instance) {
                   href = 'tel:' + phone_num;
                   href_text = formatInternational('', phone_num) || '';
                 }
-                this.$el.find('a.oe_form_uri').attr('href', href).text(href_text);
+                if (href_text) {
+                    this.$el.find('a.oe_form_uri').attr('href', href).text(href_text);
+                    this.$el.find('span.oe_form_char_content').text('');
+                } else {
+                    this.$el.find('a.oe_form_uri').attr('href', '').text('');
+                    this.$el.find('span.oe_form_char_content').text(phone_num || '');
+                }
                 var click2dial_text = '';
-                if (phone_num && !this.options.dial_button_invisible) {
+                if (href_text && !this.options.dial_button_invisible) {
                   click2dial_text = _t('Dial');
                 }
                 this.$el.find('#click2dial')
@@ -92,10 +98,19 @@ openerp.base_phone = function (instance) {
                 this._super();
             } else {
                 var fax_num = this.get('value');
+                //console.log('BASE_PHONE fax_num = %s', fax_num);
+                var href = '#';
+                var href_text = '';
                 if (fax_num) {
-                    this.$el.find('a.oe_form_uri')
-                        .attr('href', 'fax:' + fax_num)
-                        .text(formatInternational('', fax_num) || '');
+                    href = 'fax:' + fax_num;
+                    href_text = formatInternational('', fax_num) || '';
+                }
+                if (href_text) {
+                    this.$el.find('a.oe_form_uri').attr('href', href).text(href_text);
+                    this.$el.find('span.oe_form_char_content').text('');
+                } else {
+                    this.$el.find('a.oe_form_uri').attr('href', '').text('');
+                    this.$el.find('span.oe_form_char_content').text(fax_num || '');
                 }
             }
         },
diff --git a/base_phone/static/src/xml/phone.xml b/base_phone/static/src/xml/phone.xml
index 0cd269c..d1d4a59 100644
--- a/base_phone/static/src/xml/phone.xml
+++ b/base_phone/static/src/xml/phone.xml
@@ -10,7 +10,7 @@
 <t t-name="FieldPhone">
     <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <t t-if="widget.get('effective_readonly')">
-            <a href="#" class="oe_form_uri"/>
+            <a href="#" class="oe_form_uri"/><span class="oe_form_char_content"/>
             <!--
             You should add the following "<a .. />" in your IPBX-specific
             module (such as asterisk_click2dial) via <t t-extend="FieldPhone">
@@ -33,7 +33,9 @@
 
 <t t-name="FieldFax">
     <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
-        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
+        <t t-if="widget.get('effective_readonly')">
+            <a href="#" class="oe_form_uri"/><span class="oe_form_char_content"/>
+        </t>
         <t t-if="!widget.get('effective_readonly')">
             <div>
                 <input type="text"
diff --git a/base_phone/test/phonenum.yml b/base_phone/test/phonenum.yml
new file mode 100644
index 0000000..5b92efb
--- /dev/null
+++ b/base_phone/test/phonenum.yml
@@ -0,0 +1,37 @@
+-
+  Write french phone numbers in national format
+-
+  !record {model: res.partner, id: partner1}:
+    name: Pierre Paillet
+    mobile: 06 42 77 42 66
+    fax: (0) 1 45 42 12 42
+-
+  Write swiss phone numbers in international format
+-
+  !record {model: res.partner, id: partner2}:
+    name: Joël Grand-Guillaume
+    parent_id: base.res_partner_12
+    phone: +41 21 619 10 10
+    mobile: +41 79 606 42 42
+-
+  Write invalid phone number
+-
+  !record {model: res.partner, id: partner3}:
+    name: Jean Badphone
+    phone: 42
+-
+  Check that valid phone numbers have been converted to E.164
+-
+  !python {model: res.partner}: |
+    partner1 = self.browse(cr, uid, ref('partner1'), context=context)
+    assert partner1.mobile == '+33642774266', 'Mobile number not written in E.164 format (partner1)'
+    assert partner1.fax == '+33145421242', 'Fax number not written in E.164 format (partner1)'
+    partner2 = self.browse(cr, uid, ref('partner2'), context=context)
+    assert partner2.phone == '+41216191010', 'Phone number not written in E.164 format (partner2)'
+    assert partner2.mobile == '+41796064242', 'Mobile number not written in E.164 format (partner2)'
+-
+  Check that invalid phone numbers are kept unchanged
+-
+  !python {model: res.partner}: |
+    partner3 = self.browse(cr, uid, ref('partner3'), context=context)
+    assert partner3.phone == '42', 'Invalid phone numbers should not be changed'
diff --git a/base_phone/wizard/reformat_all_phonenumbers.py b/base_phone/wizard/reformat_all_phonenumbers.py
index 8546d35..f0eace7 100644
--- a/base_phone/wizard/reformat_all_phonenumbers.py
+++ b/base_phone/wizard/reformat_all_phonenumbers.py
@@ -39,6 +39,7 @@ class reformat_all_phonenumbers(orm.TransientModel):
         phonenumbers_not_reformatted = ''
         toreformat_dict = self.pool['phone.common']._get_phone_fields(
             cr, uid, context=context)
+        ctx_raise = dict(context, raise_if_phone_parse_fails=True)
         for objname, prop in toreformat_dict.iteritems():
             fields = []
             obj = self.pool[objname]
@@ -66,7 +67,7 @@ class reformat_all_phonenumbers(orm.TransientModel):
                 # _generic_reformat_phonenumbers()
                 try:
                     obj._generic_reformat_phonenumbers(
-                        cr, uid, entry, context=context)
+                        cr, uid, entry, context=ctx_raise)
                 except Exception, e:
                     name = obj.name_get(
                         cr, uid, [init_entry['id']], context=context)[0][1]
@@ -98,4 +99,8 @@ class reformat_all_phonenumbers(orm.TransientModel):
             {'phonenumbers_not_reformatted': phonenumbers_not_reformatted},
             context=context)
         logger.info('End of the phone number reformatting wizard')
-        return True
+        action = self.pool['ir.actions.act_window'].for_xml_id(
+            cr, uid, 'base_phone', 'reformat_all_phonenumbers_action',
+            context=context)
+        action['res_id'] = ids[0]
+        return action