From 076e4e2046fd7d26b03b0476cfdc312bb78cc9ee Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Mon, 27 Jun 2016 23:42:33 +0200
Subject: [PATCH] Restore click2dial feature

---
 base_phone/models/phone_common.py        |  2 +-
 base_phone/static/src/js/phone_widget.js | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/base_phone/models/phone_common.py b/base_phone/models/phone_common.py
index 74ca385..8a2a3eb 100644
--- a/base_phone/models/phone_common.py
+++ b/base_phone/models/phone_common.py
@@ -126,7 +126,7 @@ class PhoneCommon(models.AbstractModel):
         '''
         assert(erp_number), 'Missing phone number'
         _logger.debug('Number before reformat = %s' % erp_number)
-        # erp_number are supposed to be in E.164 format, so no need to
+        # erp_number are supposed to be in International format, so no need to
         # give a country code here
         parsed_num = phonenumbers.parse(erp_number, None)
         country_code = self.env.user.company_id.country_id.code
diff --git a/base_phone/static/src/js/phone_widget.js b/base_phone/static/src/js/phone_widget.js
index bb78403..4f2c53e 100644
--- a/base_phone/static/src/js/phone_widget.js
+++ b/base_phone/static/src/js/phone_widget.js
@@ -25,16 +25,18 @@ var FieldPhone = formwidgets.FieldChar.extend({
                 var self = this;
                 var phone_num = this.get('value');
                 // console.log('BASE_PHONE phone_num = %s', phone_num);
+                var raw_phone_num = '';
                 if (phone_num) {
-                    var raw_phone_num = phone_num.replace(/ /g, '');
-                    this.$el.find('a').attr('href', 'tel:' + raw_phone_num).text(phone_num);
+                    // remove non-breaking-space
+                    raw_phone_num = phone_num.replace(/ /g, '');
+                    raw_phone_num = raw_phone_num.replace(/-/g, '');
+                    this.$el.find('a.oe_form_uri').attr('href', 'tel:' + raw_phone_num).text(phone_num);
                 }
                 else {
-                    this.$el.find('a').attr('href', '').text('');
+                    this.$el.find('a.oe_form_uri').attr('href', '').text('');
                 }
-                /*
                 var click2dial_text = '';
-                if (formatted_phone_num && !this.options.dial_button_invisible) {
+                if (phone_num && !this.options.dial_button_invisible) {
                   click2dial_text = _t('Dial');
                 }
                 this.$el.find('#click2dial').off('click');
@@ -45,7 +47,7 @@ var FieldPhone = formwidgets.FieldChar.extend({
                             _t('Click2dial started'),
                             _t('Unhook your ringing phone'));
                         var arg = {
-                            'phone_number': phone_num,
+                            'phone_number': raw_phone_num,
                             'click2dial_model': self.view.dataset.model,
                             'click2dial_id': self.view.datarecord.id};
                         self.rpc('/base_phone/click2dial', arg).done(function(r) {
@@ -60,7 +62,7 @@ var FieldPhone = formwidgets.FieldChar.extend({
                                     var context = {
                                         'click2dial_model': self.view.dataset.model,
                                         'click2dial_id': self.view.datarecord.id,
-                                        'phone_number': phone_num,
+                                        'phone_number': raw_phone_num,
                                         };
                                     var action = {
                                         name: r.action_name,
@@ -75,7 +77,7 @@ var FieldPhone = formwidgets.FieldChar.extend({
                                 }
                             }
                         });
-                    }); */
+                    });
             }
         },
         on_button_clicked: function() {