[MIG] asterisk_click2dial: Migration to 17.0

OCA · Apr 4, 2024 · 89b638e · 89b638e
1 parent e1feed4
commit 89b638e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 164 deletions.
diff --git a/asterisk_click2dial/__manifest__.py b/asterisk_click2dial/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Asterisk connector",
-    "version": "14.0.2.0.0",
+    "version": "17.0.1.0.0",
     "category": "Phone",
     "license": "AGPL-3",
     "summary": "Asterisk-Odoo connector",
@@ -18,10 +18,14 @@
         "views/res_users.xml",
         "security/ir.model.access.csv",
         "security/asterisk_security.xml",
-        "views/web_asterisk_click2dial.xml",
     ],
     "demo": ["demo/asterisk_click2dial_demo.xml"],
     "qweb": ["static/src/xml/asterisk_click2dial.xml"],
     "application": True,
     "installable": True,
+    "assets": {
+        "web.assets_backend": [
+            "asterisk_click2dial/static/src/scss/*.scss",
+        ],
+    },
 }
diff --git a/asterisk_click2dial/models/phone_common.py b/asterisk_click2dial/models/phone_common.py
@@ -77,7 +77,7 @@ def click2dial(self, erp_number):
         if res_req.status_code != 200:
             raise UserError(
                 _("Click to dial with Asterisk failed.\nHTTP error code: %s.")
-                % res.status_code
+                % res_req.status_code
             )
 
         res["dialed_number"] = ast_number

diff --git a/asterisk_click2dial/models/res_users.py b/asterisk_click2dial/models/res_users.py
@@ -114,7 +114,7 @@ def _compute_asterisk_chan_name(self):
         for user in self:
             chan_name = False
             if user.asterisk_chan_type and user.resource:
-                chan_name = f"{user.asterisk_chan}/{user.resource}"
+                chan_name = f"{user.asterisk_chan_type}/{user.resource}"
             user.asterisk_chan_name = chan_name
 
     def get_asterisk_server_from_user(self):

diff --git a/asterisk_click2dial/static/src/js/asterisk_click2dial.js b/asterisk_click2dial/static/src/js/asterisk_click2dial.js
diff --git a/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml b/asterisk_click2dial/static/src/xml/asterisk_click2dial.xml
diff --git a/asterisk_click2dial/views/asterisk_server.xml b/asterisk_click2dial/views/asterisk_server.xml
@@ -36,7 +36,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                 <div class="oe_title">
                     <label for="name" string="Server Name" class="oe_edit_only" />
@@ -81,7 +81,7 @@
     <field name="name">asterisk.server.tree</field>
     <field name="model">asterisk.server</field>
     <field name="arch" type="xml">
-        <tree string="Asterisk Servers">
+        <tree>
             <field name="name" />
             <field name="ip_address" />
             <field name="company_id" groups="base.group_multi_company" />

diff --git a/asterisk_click2dial/views/web_asterisk_click2dial.xml b/asterisk_click2dial/views/web_asterisk_click2dial.xml