From 60dc99af4d1366a6e92596b0f69ffee16f5bd9d2 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 14 Apr 2015 21:30:22 +0200
Subject: [PATCH 1/4] Fix bug #40

---
 base_phone/wizard/number_not_found.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_phone/wizard/number_not_found.py b/base_phone/wizard/number_not_found.py
index 50a85af..e8e819f 100644
--- a/base_phone/wizard/number_not_found.py
+++ b/base_phone/wizard/number_not_found.py
@@ -60,7 +60,7 @@ class number_not_found(orm.TransientModel):
         if not res:
             res = {}
         if res.get('calling_number'):
-            convert = self.pool['phone.common']._generic_reformat_phonenumbers(
+            convert = self.pool['res.partner']._generic_reformat_phonenumbers(
                 cr, uid, None, {'phone': res.get('calling_number')}, context=context)
             parsed_num = phonenumbers.parse(convert.get('phone'))
             res['e164_number'] = phonenumbers.format_number(

From 60f4c3643c03f0ff97542f30c13cdfc31f109307 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 14 Apr 2015 21:47:36 +0200
Subject: [PATCH 2/4] PEP8 fix

---
 base_phone/wizard/number_not_found.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base_phone/wizard/number_not_found.py b/base_phone/wizard/number_not_found.py
index e8e819f..3580c47 100644
--- a/base_phone/wizard/number_not_found.py
+++ b/base_phone/wizard/number_not_found.py
@@ -61,7 +61,8 @@ class number_not_found(orm.TransientModel):
             res = {}
         if res.get('calling_number'):
             convert = self.pool['res.partner']._generic_reformat_phonenumbers(
-                cr, uid, None, {'phone': res.get('calling_number')}, context=context)
+                cr, uid, None, {'phone': res.get('calling_number')},
+                context=context)
             parsed_num = phonenumbers.parse(convert.get('phone'))
             res['e164_number'] = phonenumbers.format_number(
                 parsed_num, phonenumbers.PhoneNumberFormat.INTERNATIONAL)

From 1b1f3044c1d3a98ea8d3d989e9933c16c39d4a87 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 14 Apr 2015 22:13:58 +0200
Subject: [PATCH 3/4] Try to fix travis config file for v8

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55b291a..608393e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,9 @@ install:
   - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
   - travis_install_nightly
-  - sudo pip install phonenumbers py-Asterisk gevent_psycopg2 gevent_socketio
+  - sudo pip install phonenumbers py-Asterisk
   - hg clone http://bitbucket.org/anybox/web_action_request -b ${VERSION} ${HOME}/web_action_request
-  - hg clone http://bitbucket.org/anybox/web_socketio ${HOME}/web_socketio
+  - hg clone http://bitbucket.org/anybox/bus_enhanced ${HOME}/bus_enhanced
 
 script:
   - travis_run_tests

From 0f30715c03cb9797117eef06cd24ca23475dda77 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 15 Apr 2015 00:27:25 +0200
Subject: [PATCH 4/4] XML Code clean-up

---
 base_phone/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base_phone/res_users_view.xml b/base_phone/res_users_view.xml
index 99b64c9..c9962f7 100644
--- a/base_phone/res_users_view.xml
+++ b/base_phone/res_users_view.xml
@@ -13,8 +13,8 @@
     <field name="model">res.users</field>
     <field name="inherit_id" ref="base.view_users_form"/>
     <field name="arch" type="xml">
-        <notebook>
-            <page string="Telephony" name="phone" invisible="1" position="inside">
+        <notebook position="inside">
+            <page string="Telephony" name="phone" invisible="1">
             <!-- Empty page, which will be used by other phone modules -->
                 <group name="phone-preferences" string="Telephony Preferences">
                 </group>