[BKP] account_invoice_import: Backport to 13.0

Author: JaumeBforgeFlow

account_invoice_import/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "Account Invoice Import",
-    "version": "14.0.3.3.2",
+    "version": "13.0.1.0.1",
     "category": "Accounting & Finance",
     "license": "AGPL-3",
     "summary": "Import supplier invoices/refunds as PDF or XML files",

account_invoice_import/models/res_partner.py

@@ -34,8 +34,9 @@ def _compute_invoice_import_count(self):
 
     def show_account_invoice_import_config(self):
         self.ensure_one()
-        xmlid = "account_invoice_import.account_invoice_import_config_action"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env["ir.actions.act_window"].for_xml_id(
+            "account_invoice_import", "account_invoice_import_config_action"
+        )
         action["context"] = {
             "default_name": self.name,
             "default_partner_id": self.id,

account_invoice_import/security/ir.model.access.csv

@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_invoice_import_config_read,Read access on account.invoice.import.config to Invoicing and Payment,model_account_invoice_import_config,account.group_account_invoice,1,0,0,0
-access_account_invoice_import_config_readonly_grp,Read access on account.invoice.import.config to Account Readonly grp,model_account_invoice_import_config,account.group_account_readonly,1,0,0,0
 access_account_invoice_import_config_full,Full access on account.invoice.import.config to Account Manager,model_account_invoice_import_config,account.group_account_manager,1,1,1,1
 access_account_invoice_import,Access to account.invoice.import wizard,model_account_invoice_import,account.group_account_invoice,1,1,1,1

account_invoice_import/tests/test_invoice_import.py

@@ -220,7 +220,7 @@ def test_import_in_invoice(self):
                 .create_invoice(parsed_inv, import_c)
             )
             logger.debug("testing import with import config=%s", import_c)
-            self.assertEqual(inv.move_type, parsed_inv["type"])
+            self.assertEqual(inv.type, parsed_inv["type"])
             self.assertEqual(inv.company_id.id, self.company.id)
             self.assertFalse(
                 inv.currency_id.compare_amounts(
@@ -282,7 +282,7 @@ def test_import_in_invoice_tax_include(self):
                 .create_invoice(parsed_inv, import_c)
             )
             logger.debug("testing import with import config=%s", import_c)
-            self.assertEqual(inv.move_type, parsed_inv["type"])
+            self.assertEqual(inv.type, parsed_inv["type"])
             self.assertEqual(inv.company_id.id, self.company.id)
             self.assertFalse(
                 inv.currency_id.compare_amounts(
@@ -441,7 +441,7 @@ def test_email_no_partner_match(self):
         move = self.env["account.move"].search(
             [
                 ("company_id", "=", self.company.id),
-                ("move_type", "=", "in_invoice"),
+                ("type", "=", "in_invoice"),
                 ("invoice_source_email", "like", sender_email),
                 ("state", "=", "draft"),
             ]
@@ -458,7 +458,7 @@ def test_email_partner_no_invoice_config(self):
         move = self.env["account.move"].search(
             [
                 ("company_id", "=", self.company.id),
-                ("move_type", "=", "in_invoice"),
+                ("type", "=", "in_invoice"),
                 ("partner_id", "=", self.partner_with_email.id),
                 ("state", "=", "draft"),
             ]
@@ -476,7 +476,7 @@ def test_email_partner_invoice_config(self):
         move = self.env["account.move"].search(
             [
                 ("company_id", "=", self.company.id),
-                ("move_type", "=", "in_invoice"),
+                ("type", "=", "in_invoice"),
                 ("partner_id", "=", partner.id),
                 ("state", "=", "draft"),
             ]

account_invoice_import/views/account_invoice.xml

@@ -15,7 +15,7 @@
                     name="%(account_invoice_import_action)d"
                     string="Import Invoice File"
                     context="{'wizard_default_state': 'update-from-invoice', 'default_invoice_id': id, 'default_partner_id': commercial_partner_id}"
-                    attrs="{'invisible': ['|', ('move_type', 'not in', ('in_invoice', 'in_refund')), ('state', '!=', 'draft')]}"
+                    attrs="{'invisible': ['|', ('type', 'not in', ('in_invoice', 'in_refund')), ('state', '!=', 'draft')]}"
                 />
                 <!-- Button for quick access to the wizard
                      to encode multiple invoices -->
@@ -24,7 +24,7 @@
                     name="%(account_invoice_import_action)d"
                     string="Import Next Invoice"
                     context="{}"
-                    attrs="{'invisible': [('move_type', 'not in', ('in_invoice', 'in_refund'))]}"
+                    attrs="{'invisible': [('type', 'not in', ('in_invoice', 'in_refund'))]}"
                 />
             </button>
         </field>

account_invoice_import/views/account_journal_dashboard.xml

@@ -10,7 +10,7 @@
         <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
         <field name="arch" type="xml">
             <button
-                class="btn btn-primary o_button_upload_bill oe_kanban_action_button"
+                class="btn btn-primary o_button_upload_bill"
                 journal_type="purchase"
                 position="attributes"
             >

account_invoice_import/views/res_partner.xml

@@ -8,10 +8,7 @@
     <record id="view_partner_property_form" model="ir.ui.view">
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="account.view_partner_property_form" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('account.group_account_invoice')), (4, ref('account.group_account_readonly'))]"
-        />
+        <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
         <field name="arch" type="xml">
             <button
                 name="%(base.action_res_partner_bank_account_form)d"

account_invoice_import/wizard/account_invoice_import.py

@@ -242,9 +242,7 @@ def _prepare_create_invoice_journal(self, parsed_inv, import_config, company, va
         else:
             journal_id = (
                 self.env["account.move"]
-                .with_context(
-                    default_move_type=parsed_inv["type"], company_id=company.id
-                )
+                .with_context(default_type=parsed_inv["type"], company_id=company.id)
                 ._get_default_journal()
                 .id
             )
@@ -259,13 +257,13 @@ def _prepare_create_invoice_vals(self, parsed_inv, import_config):
             or self.env.company
         )
         vals = {
-            "move_type": parsed_inv["type"],
+            "type": parsed_inv["type"],
             "company_id": company.id,
             "invoice_origin": parsed_inv.get("origin"),
             "ref": parsed_inv.get("invoice_number"),
             "invoice_date": parsed_inv.get("date"),
             "narration": parsed_inv.get("narration"),
-            "payment_reference": parsed_inv.get("payment_reference"),
+            "invoice_payment_ref": parsed_inv.get("payment_reference"),
             "invoice_line_ids": [],
         }
         if parsed_inv["type"] in ("out_invoice", "out_refund"):
@@ -300,7 +298,7 @@ def _prepare_create_invoice_vals(self, parsed_inv, import_config):
             # set by invoice_date + invoice_payment_term_id otherwise
             vals["invoice_payment_term_id"] = False
         # Bank info
-        if parsed_inv.get("iban") and vals["move_type"] == "in_invoice":
+        if parsed_inv.get("iban") and vals["type"] == "in_invoice":
             partner_bank = self._match_partner_bank(
                 partner,
                 parsed_inv["iban"],
@@ -639,7 +637,7 @@ def invoice_already_exists(self, commercial_partner, parsed_inv):
             [
                 ("company_id", "=", company_id),
                 ("commercial_partner_id", "=", commercial_partner.id),
-                ("move_type", "=", parsed_inv["type"]),
+                ("type", "=", parsed_inv["type"]),
                 ("ref", "=ilike", parsed_inv.get("invoice_number")),
             ],
             limit=1,
@@ -667,8 +665,9 @@ def goto_partner_not_found(self, parsed_inv, error_message):
             if country:
                 vals["partner_country_id"] = country.id
         self.write(vals)
-        xmlid = "account_invoice_import.account_invoice_import_action"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env["ir.actions.act_window"].for_xml_id(
+            "account_invoice_import", "account_invoice_import_action"
+        )
         action["res_id"] = self.id
         return action
 
@@ -861,14 +860,15 @@ def import_invoice(self):
 
             if not wiz_vals.get("import_config_id"):
                 wiz_vals["state"] = "config"
-                xmlid = "account_invoice_import.account_invoice_import_action"
-                action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+                action = self.env["ir.actions.act_window"].for_xml_id(
+                    "account_invoice_import", "account_invoice_import_action"
+                )
                 action["res_id"] = self.id
             else:
                 draft_same_supplier_invs = amo.search(
                     [
                         ("commercial_partner_id", "=", partner.id),
-                        ("move_type", "=", parsed_inv["type"]),
+                        ("type", "=", parsed_inv["type"]),
                         ("state", "=", "draft"),
                     ]
                 )
@@ -877,8 +877,9 @@ def import_invoice(self):
                     wiz_vals["state"] = "update"
                     if len(draft_same_supplier_invs) == 1:
                         wiz_vals["invoice_id"] = draft_same_supplier_invs[0].id
-                    xmlid = "account_invoice_import.account_invoice_import_action"
-                    action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+                    action = self.env["ir.actions.act_window"].for_xml_id(
+                        "account_invoice_import", "account_invoice_import_action"
+                    )
                     action["res_id"] = self.id
                 else:
                     action = self.create_invoice_action(
@@ -905,8 +906,9 @@ def create_invoice_action(self, parsed_inv=None, import_config=None, origin=None
             assert self.import_config_id
             import_config = self.import_config_id.convert_to_import_config()
         invoice = self.create_invoice(parsed_inv, import_config, origin)
-        xmlid = "account.action_move_in_invoice_type"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env["ir.actions.act_window"].for_xml_id(
+            "account", "action_move_in_invoice_type"
+        )
         action.update(
             {
                 "view_mode": "form,tree,kanban",
@@ -1024,7 +1026,7 @@ def _prepare_global_adjustment_line(self, diff_amount, invoice, import_config):
             accounts = import_config["product"].product_tmpl_id.get_product_accounts(
                 fiscal_pos=invoice.fiscal_position_id
             )
-            if invoice.move_type in ("out_invoice", "out_refund"):
+            if invoice.type in ("out_invoice", "out_refund"):
                 account = accounts["income"]
             else:
                 account = accounts["expense"]
@@ -1420,8 +1422,9 @@ def update_invoice(self):
             )
             % self.invoice_filename
         )
-        xmlid = "account.action_move_in_invoice_type"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env["ir.actions.act_window"].for_xml_id(
+            "account", "action_move_in_invoice_type"
+        )
         action.update(
             {
                 "view_mode": "form,tree,kanban",

account_invoice_import/wizard/account_invoice_import_view.xml

@@ -59,13 +59,12 @@
                     <field
                         name="import_config_id"
                         states="config,update-from-invoice,update"
-                        domain="[('partner_id', '=', partner_id)]"
                         attrs="{'required': [('state', 'in', ('config', 'update-from-invoice', 'update'))]}"
                     />
                     <field
                         name="invoice_id"
                         states="update,update-from-invoice"
-                        domain="[('state', '=', 'draft'), ('move_type', 'in', ('in_invoice', 'in_refund')), ('commercial_partner_id', '=', partner_id), ('move_type', '=', invoice_type)]"
+                        domain="[('state', '=', 'draft'), ('type', 'in', ('in_invoice', 'in_refund')), ('commercial_partner_id', '=', partner_id), ('type', '=', invoice_type)]"
                         context="{'invoice_show_amount': True}"
                         attrs="{'readonly': [('state', '=', 'update-from-invoice')]}"
                     />