[MIG] website_whatsapp: Migration to 16.0

website_whatsapp/__manifest__.py

@@ -4,7 +4,7 @@
     "name": "Website Whatsapp",
     "summary": "Whatsapp integration",
     "category": "Website",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "website": "https://github.com/OCA/website",
     "author": "Studio73, Odoo Community Association (OCA)",
     "maintainers": ["ioans73"],

website_whatsapp/models/res_config_settings.py

@@ -1,19 +1,36 @@
 # Copyright 2022 Studio73 - Ioan Galan <ioan@studio73.es>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
-class Website(models.Model):
-    _inherit = "website"
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
 
-    whatsapp_number = fields.Char(string="WhatsApp number")
+    @api.depends("website_id.whatsapp_number")
+    def _compute_whatsapp_enabled(self):
+        for record in self:
+            record.update({"whatsapp_enabled": bool(record.whatsapp_number)})
+
+    def _inverse_whatsapp_enabled(self):
+        for record in self:
+            if not record.whatsapp_enabled:
+                record.website_id.update({"whatsapp_number": False})
+
+    whatsapp_number = fields.Char(
+        related="website_id.whatsapp_number",
+        readonly=False,
+    )
     whatsapp_text = fields.Char(
-        "Default text for Whatsapp",
-        help="Default text to send as message",
+        related="website_id.whatsapp_text",
+        readonly=False,
     )
     whatsapp_track_url = fields.Boolean(
-        "Track URL",
-        help="Indicate in the user's message the URL of the page from which it "
-        "was sent",
+        related="website_id.whatsapp_track_url",
+        readonly=False,
+    )
+    whatsapp_enabled = fields.Boolean(
+        string="Use Whatsapp",
+        compute="_compute_whatsapp_enabled",
+        inverse="_inverse_whatsapp_enabled",
     )

website_whatsapp/models/website.py

@@ -1,36 +1,19 @@
 # Copyright 2022 Studio73 - Ioan Galan <ioan@studio73.es>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
-class ResConfigSettings(models.TransientModel):
-    _inherit = "res.config.settings"
+class Website(models.Model):
+    _inherit = "website"
 
-    @api.depends("website_id.whatsapp_number")
-    def _compute_whatsapp_enabled(self):
-        for record in self:
-            record.update({"whatsapp_enabled": bool(record.whatsapp_number)})
-
-    def _inverse_whatsapp_enabled(self):
-        for record in self:
-            if not record.whatsapp_enabled:
-                record.website_id.update({"whatsapp_number": False})
-
-    whatsapp_number = fields.Char(
-        related="website_id.whatsapp_number",
-        readonly=False,
-    )
+    whatsapp_number = fields.Char(string="WhatsApp number")
     whatsapp_text = fields.Char(
-        related="website_id.whatsapp_text",
-        readonly=False,
+        "Default text for Whatsapp",
+        help="Default text to send as message",
     )
     whatsapp_track_url = fields.Boolean(
-        related="website_id.whatsapp_track_url",
-        readonly=False,
-    )
-    whatsapp_enabled = fields.Boolean(
-        string="Use Whatsapp",
-        compute="_compute_whatsapp_enabled",
-        inverse="_inverse_whatsapp_enabled",
+        "Track URL",
+        help="Indicate in the user's message the URL of the page from which it "
+        "was sent",
     )

website_whatsapp/views/res_config_settings.xml

@@ -4,8 +4,11 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='social_media_settings']" position="after">
-                <div class="col-12 col-lg-6 o_setting_box" id="website_setting">
+            <xpath expr="//div[@id='website_email_marketing']" position="inside">
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    id="website_whatsapp_setting"
+                >
                     <div class="o_setting_left_pane">
                         <field name="whatsapp_enabled" />
                     </div>