From 16339461d71d6479c168b6a2985b8d258eb158c6 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Thu, 21 Aug 2014 18:30:08 +0200
Subject: [PATCH] Port to OpenERP v8.0

---
 asterisk_click2dial/__openerp__.py            |  2 +-
 .../static/src/xml/asterisk_click2dial.xml    |  6 +++--
 .../web_asterisk_click2dial.xml               | 22 +++++++++++++++++
 base_phone/__openerp__.py                     |  6 +----
 .../lib/{js => phonenumbers}/PhoneFormat.js   |  0
 base_phone/web_phone.xml                      | 24 +++++++++++++++++++
 6 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 asterisk_click2dial/web_asterisk_click2dial.xml
 rename base_phone/static/lib/{js => phonenumbers}/PhoneFormat.js (100%)
 create mode 100644 base_phone/web_phone.xml

diff --git a/asterisk_click2dial/__openerp__.py b/asterisk_click2dial/__openerp__.py
index 9e88d11..a4f4795 100644
--- a/asterisk_click2dial/__openerp__.py
+++ b/asterisk_click2dial/__openerp__.py
@@ -59,6 +59,7 @@ A detailed documentation for this module is available on the Akretion Web site :
         'res_users_view.xml',
         'wizard/open_calling_partner_view.xml',
         'security/ir.model.access.csv',
+        'web_asterisk_click2dial.xml',
         ],
     'demo': ['asterisk_click2dial_demo.xml'],
     'images': [
@@ -66,7 +67,6 @@ A detailed documentation for this module is available on the Akretion Web site :
         'images/sshot-open_calling_party.jpg',
         ],
     'qweb': ['static/src/xml/*.xml'],
-    'js': ['static/src/js/*.js'],
     'css': ['static/src/css/*.css'],
     'application': True,
     'installable': True,
diff --git a/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml b/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml
index 3c459e4..65736dd 100644
--- a/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml
+++ b/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml
@@ -11,8 +11,10 @@
     <t t-name="asterisk_click2dial.OpenCallingPartner">
         <div title="Open Calling Partner"
                 class="oe_topbar_item oe_topbar_open_calling_partner">
-            <button class="oe_i">A</button>
-            <!-- oe_i is a special icon font : 'A' represents a phone -->
+            <button>Tel</button>
+            <!-- oe_i is a special icon font : 'A' represents a phone
+            BUT I didn't manage to make it work on v8... so I use
+            a horrible "Tel" button TODO : better button -->
         </div>
     </t>
 
diff --git a/asterisk_click2dial/web_asterisk_click2dial.xml b/asterisk_click2dial/web_asterisk_click2dial.xml
new file mode 100644
index 0000000..46b9b6d
--- /dev/null
+++ b/asterisk_click2dial/web_asterisk_click2dial.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Asterisk Click2dial module for OpenERP/Odoo
+  Copyright (C) 2014 Alexis de Lattre <alexis@via.ecp.fr>
+  The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<template id="assets_backend" name="asterisk_click2dial assets"
+          inherit_id="web.assets_backend">
+    <xpath expr="." position="inside">
+        <script type="text/javascript"
+            src="/asterisk_click2dial/static/src/js/asterisk_click2dial.js"></script>
+    </xpath>
+</template>
+
+
+</data>
+</openerp>
diff --git a/base_phone/__openerp__.py b/base_phone/__openerp__.py
index 765688b..b4c2289 100644
--- a/base_phone/__openerp__.py
+++ b/base_phone/__openerp__.py
@@ -59,14 +59,10 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
         'res_company_view.xml',
         'res_users_view.xml',
         'wizard/reformat_all_phonenumbers_view.xml',
-        ],
-    'js': [
-        'static/src/js/*.js',
-        'static/lib/js/*.js',
+        'web_phone.xml',
         ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': ['base_phone_demo.xml'],
     'images': [],
     'installable': True,
-    'active': False,
 }
diff --git a/base_phone/static/lib/js/PhoneFormat.js b/base_phone/static/lib/phonenumbers/PhoneFormat.js
similarity index 100%
rename from base_phone/static/lib/js/PhoneFormat.js
rename to base_phone/static/lib/phonenumbers/PhoneFormat.js
diff --git a/base_phone/web_phone.xml b/base_phone/web_phone.xml
new file mode 100644
index 0000000..0187a42
--- /dev/null
+++ b/base_phone/web_phone.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Base Phone module for OpenERP
+  Copyright (C) 2014 Alexis de Lattre <alexis@via.ecp.fr>
+  The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<template id="assets_backend" name="base_phone assets"
+          inherit_id="web.assets_backend">
+    <xpath expr="." position="inside">
+        <script type="text/javascript"
+            src="/base_phone/static/lib/phonenumbers/PhoneFormat.js"></script>
+        <script type="text/javascript"
+            src="/base_phone/static/src/js/phone_widget.js"></script>
+    </xpath>
+</template>
+
+
+</data>
+</openerp>