From fe21ceb425757d70fd061eff46b1b0aafaa79227 Mon Sep 17 00:00:00 2001
From: Nils Coenen <74965194+NICO-SOLUTIONS@users.noreply.github.com>
Date: Mon, 25 Mar 2024 08:49:07 +0100
Subject: [PATCH] [MIG] account_invoice_overdue_reminder: Migration to 17.0

---
 account_invoice_overdue_reminder/README.rst   |  1 +
 .../__manifest__.py                           |  2 +-
 account_invoice_overdue_reminder/hooks.py     |  8 +-
 .../readme/CONTRIBUTORS.md                    |  1 +
 .../static/description/index.html             |  1 +
 .../account_invoice_overdue_reminder.xml      | 21 ++---
 .../views/account_move.xml                    | 10 +--
 .../views/overdue_reminder_action.xml         | 15 +---
 .../views/overdue_reminder_result.xml         |  2 +-
 .../views/res_partner.xml                     |  4 +-
 .../wizard/overdue_reminder_wizard.py         | 45 ++++------
 .../wizard/overdue_reminder_wizard_view.xml   | 43 ++++-----
 .../wizard/res_config_settings_view.xml       | 90 ++++++++-----------
 13 files changed, 93 insertions(+), 150 deletions(-)

diff --git a/account_invoice_overdue_reminder/README.rst b/account_invoice_overdue_reminder/README.rst
index fee5294fd..035391017 100644
--- a/account_invoice_overdue_reminder/README.rst
+++ b/account_invoice_overdue_reminder/README.rst
@@ -160,6 +160,7 @@ Contributors
 ------------
 
 -  Alexis de Lattre <alexis.delattre@akretion.com>
+-  Nils Coenen <nils.coenen@nico-solutions.de>
 
 Maintainers
 -----------
diff --git a/account_invoice_overdue_reminder/__manifest__.py b/account_invoice_overdue_reminder/__manifest__.py
index 693da16d6..54df81198 100644
--- a/account_invoice_overdue_reminder/__manifest__.py
+++ b/account_invoice_overdue_reminder/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Overdue Invoice Reminder",
-    "version": "16.0.1.3.0",
+    "version": "17.0.1.0.0",
     "category": "Accounting",
     "license": "AGPL-3",
     "summary": "Simple mail/letter/phone overdue customer invoice reminder ",
diff --git a/account_invoice_overdue_reminder/hooks.py b/account_invoice_overdue_reminder/hooks.py
index d56d429b6..150857957 100644
--- a/account_invoice_overdue_reminder/hooks.py
+++ b/account_invoice_overdue_reminder/hooks.py
@@ -5,18 +5,18 @@
 _logger = logging.getLogger(__name__)
 
 
-def pre_init_hook(cr):
+def pre_init_hook(env):
     _logger.info(
         "Pre-creating column overdue_reminder_last_date for table account_move"
     )
-    cr.execute(
+    env.cr.execute(
         """
         ALTER TABLE account_move
         ADD COLUMN IF NOT EXISTS overdue_reminder_last_date Date;
         """
     )
     _logger.info("Pre-creating column overdue_reminder_counter for table account_move")
-    cr.execute(
+    env.cr.execute(
         """
         ALTER TABLE account_move
         ADD COLUMN IF NOT EXISTS overdue_reminder_counter INTEGER DEFAULT 0;
@@ -24,7 +24,7 @@ def pre_init_hook(cr):
         """
     )
     _logger.info("Pre-creating column no_overdue_reminder for table account_move")
-    cr.execute(
+    env.cr.execute(
         """
         ALTER TABLE account_move
         ADD COLUMN IF NOT EXISTS no_overdue_reminder BOOL DEFAULT False;
diff --git a/account_invoice_overdue_reminder/readme/CONTRIBUTORS.md b/account_invoice_overdue_reminder/readme/CONTRIBUTORS.md
index b61afe5d0..bc00956c8 100644
--- a/account_invoice_overdue_reminder/readme/CONTRIBUTORS.md
+++ b/account_invoice_overdue_reminder/readme/CONTRIBUTORS.md
@@ -1 +1,2 @@
 - Alexis de Lattre \<<alexis.delattre@akretion.com>\>
+- Nils Coenen \<<nils.coenen@nico-solutions.de>\>
diff --git a/account_invoice_overdue_reminder/static/description/index.html b/account_invoice_overdue_reminder/static/description/index.html
index 1de22660b..62bf2b196 100644
--- a/account_invoice_overdue_reminder/static/description/index.html
+++ b/account_invoice_overdue_reminder/static/description/index.html
@@ -503,6 +503,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
+<li>Nils Coenen &lt;<a class="reference external" href="mailto:nils.coenen&#64;nico-solutions.de">nils.coenen&#64;nico-solutions.de</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/account_invoice_overdue_reminder/views/account_invoice_overdue_reminder.xml b/account_invoice_overdue_reminder/views/account_invoice_overdue_reminder.xml
index 5fa5bb409..4bb5a5174 100644
--- a/account_invoice_overdue_reminder/views/account_invoice_overdue_reminder.xml
+++ b/account_invoice_overdue_reminder/views/account_invoice_overdue_reminder.xml
@@ -13,10 +13,7 @@
     <field name="arch" type="xml">
         <form>
             <group name="main">
-                <field
-                        name="counter"
-                        attrs="{'invisible': [('action_reminder_type', '=', 'phone')]}"
-                    />
+                <field name="counter" invisible="action_reminder_type == 'phone'" />
                 <field
                         name="action_commercial_partner_id"
                         invisible="not context.get('overdue_reminder_main_view')"
@@ -31,15 +28,15 @@
                 <field name="action_reminder_type" />
                 <field
                         name="action_mail_id"
-                        attrs="{'invisible': [('action_reminder_type', '!=', 'mail')]}"
+                        invisible="action_reminder_type != 'mail'"
                     />
                 <field
                         name="action_mail_cc"
-                        attrs="{'invisible': [('action_reminder_type', '!=', 'mail')]}"
+                        invisible="action_reminder_type != 'mail'"
                     />
                 <field
                         name="action_mail_state"
-                        attrs="{'invisible': [('action_reminder_type', '!=', 'mail')]}"
+                        invisible="action_reminder_type != 'mail'"
                     />
             </group>
             <group string="Info/Result" name="result">
@@ -59,10 +56,7 @@
             <group name="main">
                 <field name="invoice_id" />
                 <field name="action_reminder_type" invisible="1" />
-                <field
-                        name="counter"
-                        attrs="{'invisible': [('action_reminder_type', '=', 'phone')]}"
-                    />
+                <field name="counter" invisible="action_reminder_type == 'phone'" />
             </group>
         </form>
     </field>
@@ -73,10 +67,7 @@
     <field name="model">account.invoice.overdue.reminder</field>
     <field name="arch" type="xml">
         <tree>
-            <field
-                    name="counter"
-                    attrs="{'invisible': [('action_reminder_type', '=', 'phone')]}"
-                />
+            <field name="counter" invisible="action_reminder_type == 'phone'" />
             <field name="action_date" />
             <field
                     name="action_partner_id"
diff --git a/account_invoice_overdue_reminder/views/account_move.xml b/account_invoice_overdue_reminder/views/account_move.xml
index 0aeeedd7b..4a63e490e 100644
--- a/account_invoice_overdue_reminder/views/account_move.xml
+++ b/account_invoice_overdue_reminder/views/account_move.xml
@@ -13,18 +13,14 @@
     <field name="inherit_id" ref="account.view_move_form" />
     <field name="arch" type="xml">
         <div role="alert" position="after">
-                <div
-                    class="alert alert-warning"
-                    role="alert"
-                    attrs="{'invisible': [('overdue', '=', False)]}"
-                >
+                <div class="alert alert-warning" role="alert" invisible="not overdue">
                         This customer invoice is overdue.
             <button
                         name="%(overdue_reminder_start_action)d"
                         string="Send an overdue reminder"
                         type="action"
                         context="{'default_partner_ids': [commercial_partner_id]}"
-                        attrs="{'invisible': ['|', '|', ('overdue', '=', False), ('no_overdue_reminder', '=', True), ('overdue_remind_sent', '=', True)]}"
+                        invisible="not overdue or no_overdue_reminder or overdue_remind_sent"
                         class="oe_link"
                     />
 
@@ -34,7 +30,7 @@
             <page
                     name="overdue_reminder"
                     string="Overdue Reminder"
-                    attrs="{'invisible': [('overdue', '=', False)]}"
+                    invisible="not overdue"
                 >
                 <group name="overdue_reminder_main" col="4">
                     <field name="overdue_reminder_counter" />
diff --git a/account_invoice_overdue_reminder/views/overdue_reminder_action.xml b/account_invoice_overdue_reminder/views/overdue_reminder_action.xml
index 0ce6530e4..dce530ca7 100644
--- a/account_invoice_overdue_reminder/views/overdue_reminder_action.xml
+++ b/account_invoice_overdue_reminder/views/overdue_reminder_action.xml
@@ -18,18 +18,9 @@
                 <field name="date" />
                 <field name="user_id" />
                 <field name="reminder_type" />
-                <field
-                        name="mail_id"
-                        attrs="{'invisible': [('reminder_type', '!=', 'mail')]}"
-                    />
-                <field
-                        name="mail_cc"
-                        attrs="{'invisible': [('reminder_type', '!=', 'mail')]}"
-                    />
-                <field
-                        name="mail_state"
-                        attrs="{'invisible': [('reminder_type', '!=', 'mail')]}"
-                    />
+                <field name="mail_id" invisible="reminder_type != 'mail'" />
+                <field name="mail_cc" invisible="reminder_type != 'mail'" />
+                <field name="mail_state" invisible="reminder_type != 'mail'" />
             </group>
             <group name="result" string="Info/Result">
                 <field name="result_id" widget="selection" />
diff --git a/account_invoice_overdue_reminder/views/overdue_reminder_result.xml b/account_invoice_overdue_reminder/views/overdue_reminder_result.xml
index e6a2f0c50..34e87dd58 100644
--- a/account_invoice_overdue_reminder/views/overdue_reminder_result.xml
+++ b/account_invoice_overdue_reminder/views/overdue_reminder_result.xml
@@ -17,7 +17,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                 <group name="main">
                     <field name="name" />
diff --git a/account_invoice_overdue_reminder/views/res_partner.xml b/account_invoice_overdue_reminder/views/res_partner.xml
index 058cec640..272fd834a 100644
--- a/account_invoice_overdue_reminder/views/res_partner.xml
+++ b/account_invoice_overdue_reminder/views/res_partner.xml
@@ -16,7 +16,7 @@
             <group
                     name="overdue_reminder"
                     string="Overdue Reminder"
-                    attrs="{'invisible': [('customer_rank', '&lt;=', 0)]}"
+                    invisible="customer_rank &lt;= 0"
                 >
                 <field name="no_overdue_reminder" />
                 <field name="customer_rank" invisible="1" />
@@ -27,7 +27,7 @@
 
 <record id="action_overdue_reminder_action" model="ir.actions.act_window">
     <field name="name">Overdue Reminder Actions</field>
-    <field name="context">{'search_default_commercial_partner_id': [active_id]}</field>
+    <field name="context">{'search_default_commercial_partner_id': [id]}</field>
     <field name="res_model">overdue.reminder.action</field>
     <field name="binding_model_id" ref="base.model_res_partner" />
     <field name="binding_view_types">form</field>
diff --git a/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard.py b/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard.py
index 00da1174e..3e1d6b750 100644
--- a/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard.py
+++ b/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard.py
@@ -567,38 +567,29 @@ def validate_mail(self):
     def generate_mail_vals(self):
         self.ensure_one()
         xmlid = self._get_overdue_invoice_reminder_template()
-        mvals = self.env.ref(xmlid).generate_email(
-            self.id, ["email_from", "email_to", "partner_to", "reply_to"]
-        )
+        template = self.env.ref(xmlid)
         cc_list = [p.email for p in self.mail_cc_partner_ids if p.email]
-        if mvals.get("email_cc"):
-            cc_list.append(mvals["email_cc"])
-        mvals.update(
-            {
-                "subject": self.mail_subject,
-                "body_html": self.mail_body,
-                "email_cc": ", ".join(cc_list),
-                "model": "res.partner",
-                "res_id": self.commercial_partner_id.id,
-            }
-        )
-        mvals.pop("attachment_ids", None)
-        mvals.pop("attachments", None)
-        mail = self.env["mail.mail"].sudo().create(mvals)
+        if template.email_cc:
+            cc_list.append(template.email_cc)
+        cc = ", ".join(cc_list)
+        mail_vals = {
+            "email_from": self.user_id.email,
+            "email_to": self.partner_id.email,
+            "subject": self.mail_subject,
+            "body_html": self.mail_body,
+            "email_cc": cc,
+            "model": "res.partner",
+            "res_id": self.commercial_partner_id.id,
+        }
+        mail_vals.pop("attachment_ids", None)
+        mail_vals.pop("attachments", None)
+        mail = self.env["mail.mail"].sudo().create(mail_vals)
+
         if self.company_id.overdue_reminder_attach_invoice:
             attachment_ids = self._get_attachment_ids(mail)
             mail.write({"attachment_ids": [(6, 0, attachment_ids)]})
-        vals = {"mail_id": mail.id}
-        return vals
 
-    def validate_phone(self):
-        self.ensure_one()
-        assert self.reminder_type == "phone"
-        vals = {
-            "result_id": self.result_id.id or False,
-            "result_notes": self.result_notes,
-        }
-        return vals
+        return {"mail_id": mail.id}
 
     def validate_post(self):
         self.ensure_one()
diff --git a/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard_view.xml b/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard_view.xml
index aac8def8e..c18202749 100644
--- a/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard_view.xml
+++ b/account_invoice_overdue_reminder/wizard/overdue_reminder_wizard_view.xml
@@ -117,7 +117,7 @@
                 <field name="company_id" invisible="1" />
             </group>
             <group
-                    attrs="{'invisible': [('warn_unreconciled_move_line_ids', '=', [])]}"
+                    invisible="not warn_unreconciled_move_line_ids"
                     string="WARNING: unreconciled payments/refunds"
                     col="1"
                 >
@@ -157,8 +157,8 @@
                                 string="Amount Due"
                                 sum="Amount Due"
                             />
-                        <field name="currency_id" invisible="1" />
-                        <field name="company_currency_id" invisible="1" />
+                        <field name="currency_id" column_invisible="1" />
+                        <field name="company_currency_id" column_invisible="1" />
                         <field
                                 name="overdue_reminder_counter"
                                 string="Current Remind Counter"
@@ -167,47 +167,35 @@
                                 name="overdue_reminder_last_date"
                                 string="Last Reminder"
                             />
-                        <field name="state" invisible="1" />
-                        <field name="payment_state" invisible="1" />
+                        <field name="state" column_invisible="1" />
+                        <field name="payment_state" column_invisible="1" />
                     </tree>
                 </field>
             </group>
             <group name="reminder_type">
                 <field name="reminder_type" />
             </group>
-            <group
-                    name="phone"
-                    attrs="{'invisible': [('reminder_type', '!=', 'phone')]}"
-                >
+            <group name="phone" invisible="reminder_type != 'phone'">
                 <field
                         name="result_id"
                         widget="selection"
-                        attrs="{'required': [('reminder_type', '=', 'phone')]}"
+                        required="reminder_type == 'phone'"
                     />
                 <field name="result_notes" />
                 <field name="create_activity" />
             </group>
             <group
                     name="phone_activity"
-                    attrs="{'invisible': ['|', ('reminder_type', '!=', 'phone'), ('create_activity', '=', False)]}"
+                    invisible="reminder_type != 'phone' or create_activity == 'False'"
                     col="4"
                 >
-                <field
-                        name="activity_type_id"
-                        attrs="{'required': [('create_activity', '=', True)]}"
-                    />
-                <field
-                        name="activity_deadline"
-                        attrs="{'required': [('create_activity', '=', True)]}"
-                    />
+                <field name="activity_type_id" required="create_activity" />
+                <field name="activity_deadline" required="create_activity" />
                 <field name="activity_summary" />
-                <field
-                        name="activity_user_id"
-                        attrs="{'required': [('create_activity', '=', True)]}"
-                    />
+                <field name="activity_user_id" required="create_activity" />
                 <field name="activity_note" colspan="4" nolabel="1" />
             </group>
-            <group name="mail" attrs="{'invisible': [('reminder_type', '!=', 'mail')]}">
+            <group name="mail" invisible="reminder_type != 'mail'">
                 <field
                         name="mail_cc_partner_ids"
                         domain="[('id', 'child_of', commercial_partner_id), ('id', '!=', partner_id), ('email', '!=', False)]"
@@ -216,7 +204,7 @@
                 <field name="mail_subject" />
                 <field name="mail_body" colspan="2" nolabel="1" />
             </group>
-            <group attrs="{'invisible': [('reminder_type', '!=', 'post')]}" col="1">
+            <group invisible="reminder_type != 'post'" col="1">
                 <button
                         name="print_letter"
                         type="object"
@@ -272,7 +260,7 @@
             <field name="reminder_type" />
             <field name="invoice_ids" />
             <field name="warn_unreconciled_move_line_ids" />
-            <field name="state" invisible="1" />
+            <field name="state" column_invisible="1" />
         </tree>
     </field>
 </record>
@@ -300,7 +288,8 @@
                 <field name="update_action" />
                 <field
                         name="reminder_type"
-                        attrs="{'required': [('update_action', '=', 'reminder_type')], 'invisible': [('update_action', '!=', 'reminder_type')]}"
+                        required="update_action == reminder_type"
+                        invisible="update_action != reminder_type"
                     />
             </group>
             <footer>
diff --git a/account_invoice_overdue_reminder/wizard/res_config_settings_view.xml b/account_invoice_overdue_reminder/wizard/res_config_settings_view.xml
index dbce79c27..8e6136883 100644
--- a/account_invoice_overdue_reminder/wizard/res_config_settings_view.xml
+++ b/account_invoice_overdue_reminder/wizard/res_config_settings_view.xml
@@ -13,73 +13,55 @@
     <field name="inherit_id" ref="account.res_config_settings_view_form" />
     <field name="arch" type="xml">
         <xpath
-                expr="//div[@id='pay_invoice_online_setting_container']"
+                expr="//block[@id='pay_invoice_online_setting_container']"
                 position="after"
             >
-            <h2>Overdue Invoice Reminder</h2>
-            <div class="row mt16 o_settings_container" id="overdue_reminder">
-                <div
-                        class="col-12 col-md-12 o_setting_box"
-                        id="overdue_reminder_attach_invoice"
+            <block title="Overdue Invoice Reminder" id="overdue_reminder">
+                <setting
+                        id="overdue_reminder"
+                        string="Attach Invoices"
+                        help="Attach Invoices to Overdue Reminder E-mails"
                     >
-                        <div class="o_setting_left_pane">
-                                <field name="overdue_reminder_attach_invoice" />
-                        </div>
-                    <div class="o_setting_right_pane">
-                        <div class="row" name="overdue_reminder_attach_invoice">
-                            <label
-                                    for="overdue_reminder_attach_invoice"
-                                    class="col-md-5"
-                                />
-                    </div>
-                    </div>
-                </div>
-                <div
-                        class="col-12 col-md-12 o_setting_box"
-                        id="overdue_reminder_other_fields"
+                    <field name="overdue_reminder_attach_invoice" />
+                </setting>
+                <setting
+                        id="overdue_reminder_policy"
+                        string="Contact to Remind"
+                        help="Default Contact to Remind"
                     >
-                        <div class="o_setting_left_pane" />
-                    <div class="o_setting_right_pane">
-                        <div class="row" name="overdue_reminder_partner_policy">
-                            <label
-                                    for="overdue_reminder_partner_policy"
-                                    class="col-md-5"
-                                />
-                            <field name="overdue_reminder_partner_policy" />
-                        </div>
-                        <div class="row" name="overdue_reminder_interface">
-                            <label
-                                    for="overdue_reminder_interface"
-                                    class="col-md-5"
-                                    string="Default Wizard Interface"
-                                />
-                            <field name="overdue_reminder_interface" />
-                        </div>
-                        <div class="row" name="overdue_reminder_start_days">
+                    <field name="overdue_reminder_partner_policy" />
+                </setting>
+                <setting
+                        id="overdue_reminder_if"
+                        string="Reminder Wizard"
+                        help="Default Overdue Reminder Wizard Interface"
+                    >
+                    <field name="overdue_reminder_interface" />
+                </setting>
+                <setting
+                        id="overdue_reminder_days"
+                        string="Default Overdue Reminder Settings"
+                    >
+                    <div class="content-group">
+                        <div class="row mt8">
                             <label
                                     for="overdue_reminder_start_days"
-                                    class="col-md-5"
-                                    string="Default Reminder Trigger Delay"
+                                    string="Trigger Delay (days)"
+                                    class="col-lg-4 o_light_label"
                                 />
-                            <field
-                                    name="overdue_reminder_start_days"
-                                    class="col-md-1"
-                                /> days
+                            <field name="overdue_reminder_start_days" />
                         </div>
-                        <div class="row" name="overdue_reminder_min_interval_days">
+                        <div class="row mt8">
                             <label
                                     for="overdue_reminder_min_interval_days"
-                                    class="col-md-5"
-                                    string="Default Reminder Minimum Interval"
+                                    string="Minimum Interval (days)"
+                                    class="col-lg-4 o_light_label"
                                 />
-                            <field
-                                    name="overdue_reminder_min_interval_days"
-                                    class="col-md-1"
-                                /> days
+                            <field name="overdue_reminder_min_interval_days" />
                         </div>
                     </div>
-                </div>
-            </div>
+                </setting>
+            </block>
         </xpath>
     </field>
 </record>