From 5cd98157f476c08f81f27fca7341c60ad7d8eeed Mon Sep 17 00:00:00 2001
From: titus <22006titus@gmail.com>
Date: Thu, 15 Jun 2023 15:22:51 +0700
Subject: [PATCH] ss[MIG] account_payment_multi_deduction: Migration to 16.0

---
 .../__manifest__.py                           |   2 +-
 .../wizard/account_payment_register.py        |  14 +-
 .../wizard/account_payment_register_views.xml | 145 +++++++++---------
 3 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/account_payment_multi_deduction/__manifest__.py b/account_payment_multi_deduction/__manifest__.py
index daace4af46f7..a23045303e82 100644
--- a/account_payment_multi_deduction/__manifest__.py
+++ b/account_payment_multi_deduction/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Payment Register with Multiple Deduction",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "author": "Ecosoft, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/account-payment",
diff --git a/account_payment_multi_deduction/wizard/account_payment_register.py b/account_payment_multi_deduction/wizard/account_payment_register.py
index 5494839be59c..8330b51ed77e 100644
--- a/account_payment_multi_deduction/wizard/account_payment_register.py
+++ b/account_payment_multi_deduction/wizard/account_payment_register.py
@@ -47,7 +47,12 @@ def _compute_default_analytic(self):
         active_ids = self.env.context.get("active_ids")
         moves = self.env["account.move"].browse(active_ids)
         move_lines = moves.mapped("line_ids")
-        analytic_account = move_lines.mapped("analytic_account_id")
+        analytic_account = (
+            move_lines.mapped("analytic_account_id")
+            if "analytic_account_id" in move_lines._fields
+            else self.env["account.analytic.account"]
+        )
+
         analytic_tag = move_lines.mapped("analytic_tag_ids")
         taxes_account = (
             self.env["account.tax.repartition.line"]
@@ -71,7 +76,12 @@ def _compute_default_analytic(self):
 
     def _update_vals_deduction(self, moves):
         move_lines = moves.mapped("line_ids")
-        analytic_account = move_lines.mapped("analytic_account_id")
+        analytic_account = (
+            move_lines.mapped("analytic_account_id")
+            if "analytic_account_id" in move_lines._fields
+            else self.env["account.analytic.account"]
+        )
+
         analytic_tag = move_lines.mapped("analytic_tag_ids")
         taxes_account = (
             self.env["account.tax.repartition.line"]
diff --git a/account_payment_multi_deduction/wizard/account_payment_register_views.xml b/account_payment_multi_deduction/wizard/account_payment_register_views.xml
index 8cd0e1e8c4d9..1f453b10bc38 100644
--- a/account_payment_multi_deduction/wizard/account_payment_register_views.xml
+++ b/account_payment_multi_deduction/wizard/account_payment_register_views.xml
@@ -3,83 +3,82 @@
         <field name="name">account.payment.register.form</field>
         <field name="model">account.payment.register</field>
         <field name="inherit_id" ref="account.view_account_payment_register_form" />
-        <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='writeoff_account_id']" position="after">
-                <div
-                    attrs="{'invisible': [('payment_difference_handling', '!=', 'reconcile')]}"
-                >
-                    <label
-                        for="writeoff_analytic_account_id"
-                        class="oe_edit_only"
-                        groups="analytic.group_analytic_accounting"
-                    />
-                    <field
-                        name="writeoff_analytic_account_id"
+            <data>
+                <xpath expr="//field[@name='writeoff_account_id']" position="after">
+                    <div
+                        attrs="{'invisible': [('payment_difference_handling', '!=', 'reconcile')]}"
                         groups="analytic.group_analytic_accounting"
-                    />
-                    <label
-                        for="writeoff_analytic_tag_ids"
-                        class="oe_edit_only"
-                        groups="analytic.group_analytic_tags"
-                    />
-                    <field
-                        name="writeoff_analytic_tag_ids"
-                        groups="analytic.group_analytic_tags"
-                        widget="many2many_tags"
-                    />
-                </div>
-            </xpath>
-            <xpath
-                expr="/form/group/group[@name='group3']/div/div"
-                position="attributes"
-            >
-                <attribute
-                    name="attrs"
-                >{'invisible': [('payment_difference_handling','!=','reconcile')]}</attribute>
-            </xpath>
-            <xpath expr="/form/group/group[@name='group3']" position="after">
-                <group
-                    colspan="4"
-                    attrs="{'invisible': [('payment_difference_handling', '!=', 'reconcile_multi_deduct')]}"
+                    >
+                        <label
+                            for="writeoff_analytic_account_id"
+                            class="oe_edit_only"
+                            groups="analytic.group_analytic_accounting"
+                        />
+                        <field
+                            name="writeoff_analytic_account_id"
+                            groups="analytic.group_analytic_accounting"
+                        />
+                        <label
+                            for="writeoff_analytic_tag_ids"
+                            class="oe_edit_only"
+                            groups="analytic.group_analytic_tags"
+                        />
+                        <field
+                            name="writeoff_analytic_tag_ids"
+                            groups="analytic.group_analytic_tags"
+                            widget="many2many_tags"
+                        />
+                    </div>
+                </xpath>
+                <xpath
+                    expr="/form/group/group[@name='group3']/div/div"
+                    position="attributes"
                 >
-                    <field name="deduct_residual" invisible="1" />
-                    <field name="deduct_analytic_account_id" invisible="1" />
-                    <field name="deduct_analytic_tag_ids" invisible="1" />
-                    <field
-                        name="deduction_ids"
-                        nolabel="1"
-                        colspan="2"
-                        context="{
-                            'default_amount': deduct_residual,
-                            'default_analytic_account_id': deduct_analytic_account_id,
-                            'default_analytic_tag_ids': deduct_analytic_tag_ids
-                        }"
+                    <attribute
+                        name="attrs"
+                    >{'invisible': [('payment_difference_handling','!=','reconcile')]}</attribute>
+                </xpath>
+                <xpath expr="/form/group/group[@name='group3']" position="after">
+                    <group
+                        colspan="4"
+                        attrs="{'invisible': [('payment_difference_handling', '!=', 'reconcile_multi_deduct')]}"
+                        groups="base.group_user"
                     >
-                        <tree editable="bottom">
-                            <field name="currency_id" invisible="1" />
-                            <field name="open" />
-                            <field
-                                name="account_id"
-                                attrs="{'required': [('open', '=', False)]}"
-                            />
-                            <field
-                                name="analytic_account_id"
-                                optional="show"
-                                groups="analytic.group_analytic_accounting"
-                            />
-                            <field
-                                name="analytic_tag_ids"
-                                widget="many2many_tags"
-                                optional="show"
-                                groups="analytic.group_analytic_tags"
-                            />
-                            <field name="name" />
-                            <field name="amount" sum="Total Deduction" />
-                        </tree>
-                    </field>
-                </group>
-            </xpath>
+                        <field name="deduct_residual" invisible="1" />
+                        <field name="deduct_analytic_account_id" invisible="1" />
+                        <field name="deduct_analytic_tag_ids" invisible="1" />
+                        <field
+                            name="deduction_ids"
+                            nolabel="1"
+                            colspan="2"
+                            context="{'default_amount': deduct_residual, 'default_analytic_account_id': deduct_analytic_account_id, 'default_analytic_tag_ids': deduct_analytic_tag_ids}"
+                        >
+                            <tree editable="bottom">
+                                <field name="currency_id" invisible="1" />
+                                <field name="open" />
+                                <field
+                                    name="account_id"
+                                    attrs="{'required': [('open', '=', False)]}"
+                                />
+                                <field
+                                    name="analytic_account_id"
+                                    optional="show"
+                                    groups="analytic.group_analytic_accounting"
+                                />
+                                <field
+                                    name="analytic_tag_ids"
+                                    widget="many2many_tags"
+                                    optional="show"
+                                    groups="analytic.group_analytic_tags"
+                                />
+                                <field name="name" />
+                                <field name="amount" sum="Total Deduction" />
+                            </tree>
+                        </field>
+                    </group>
+                </xpath>
+            </data>
         </field>
     </record>
 </odoo>