[FIX] l10n_es_intrastat_report: Incompatibility with other intrastat

TT55417

Author: juancarlosonate-tecnativa

l10n_es_intrastat_report/models/l10n_es_intrastat_product_declaration.py

@@ -34,24 +34,25 @@ def _get_intrastat_state(self, inv_line):
 
     def _update_computation_line_vals(self, inv_line, line_vals, notedict):
         result = super()._update_computation_line_vals(inv_line, line_vals, notedict)
-        intrastat_state = self._get_intrastat_state(inv_line)
-        if intrastat_state:
-            line_vals["intrastat_state_id"] = intrastat_state.id
-        incoterm_id = self._get_incoterm(inv_line, notedict)
-        if incoterm_id:
-            line_vals["incoterm_id"] = incoterm_id.id
-        if self.declaration_type == "dispatches" and int(self.year) >= 2022:
-            line_vals["partner_vat"] = (
-                inv_line.move_id.partner_shipping_id.vat or "QV999999999999"
-            )
-            fiscal_pos = inv_line.move_id.fiscal_position_id
-            if fiscal_pos and fiscal_pos.intrastat == "b2c":
-                return result
-            if not inv_line.move_id.partner_shipping_id.vat:
-                msg = _("Missing partner <em>VAT Number</em>")
-                notedict["partner"][inv_line.move_id.partner_id.display_name][msg].add(
-                    notedict["inv_origin"]
+        if self.company_id.country_id.code == "ES":
+            intrastat_state = self._get_intrastat_state(inv_line)
+            if intrastat_state:
+                line_vals["intrastat_state_id"] = intrastat_state.id
+            incoterm_id = self._get_incoterm(inv_line, notedict)
+            if incoterm_id:
+                line_vals["incoterm_id"] = incoterm_id.id
+            if self.declaration_type == "dispatches" and int(self.year) >= 2022:
+                line_vals["partner_vat"] = (
+                    inv_line.move_id.partner_shipping_id.vat or "QV999999999999"
                 )
+                fiscal_pos = inv_line.move_id.fiscal_position_id
+                if fiscal_pos and fiscal_pos.intrastat == "b2c":
+                    return result
+                if not inv_line.move_id.partner_shipping_id.vat:
+                    msg = _("Missing partner <em>VAT Number</em>")
+                    notedict["partner"][inv_line.move_id.partner_id.display_name][
+                        msg
+                    ].add(notedict["inv_origin"])
         return result
 
     def _gather_invoices_init(self, notedict):
@@ -71,21 +72,23 @@ def _prepare_invoice_domain(self):
         - companies subject to arrivals or dispatches only
         """
         domain = super()._prepare_invoice_domain()[:-1]
-        if self.declaration_type == "arrivals":
-            domain.append(("move_type", "in", ("in_invoice", "out_refund")))
-        elif self.declaration_type == "dispatches":
-            domain.append(("move_type", "in", ("out_invoice", "in_refund")))
+        if self.company_id.country_id.code == "ES":
+            if self.declaration_type == "arrivals":
+                domain.append(("move_type", "in", ("in_invoice", "out_refund")))
+            elif self.declaration_type == "dispatches":
+                domain.append(("move_type", "in", ("out_invoice", "in_refund")))
         return domain
 
     def _generate_xml(self):
         return self._generate_csv()
 
     def _attach_xml_file(self, xml_string, declaration_name):
         attach_id = super()._attach_xml_file(xml_string, declaration_name)
-        self.ensure_one()
-        attach = self.env["ir.attachment"].browse(attach_id)
-        filename = "{}_{}.csv".format(self.year_month, declaration_name)
-        attach.write({"name": filename})
+        if self.company_id.country_id.code == "ES":
+            self.ensure_one()
+            attach = self.env["ir.attachment"].browse(attach_id)
+            filename = "{}_{}.csv".format(self.year_month, declaration_name)
+            attach.write({"name": filename})
         return attach.id
 
     def _generate_csv_line(self, line):
@@ -161,21 +164,23 @@ def create_xls(self):
     @api.model
     def _xls_computation_line_fields(self):
         res = super()._xls_computation_line_fields()
-        if (
-            self.env.context.get("declaration_type", False) == "dispatches"
-            and int(self.env.context.get("declaration_year", 0)) >= 2022
-        ):
-            res.append("partner_vat")
+        if self.company_id.country_id.code == "ES":
+            if (
+                self.env.context.get("declaration_type", False) == "dispatches"
+                and int(self.env.context.get("declaration_year", 0)) >= 2022
+            ):
+                res.append("partner_vat")
         return res
 
     @api.model
     def _xls_declaration_line_fields(self):
         res = super()._xls_declaration_line_fields()
-        if (
-            self.env.context.get("declaration_type", False) == "dispatches"
-            and int(self.env.context.get("declaration_year", 0)) >= 2022
-        ):
-            res.append("partner_vat")
+        if self.company_id.country_id.code == "ES":
+            if (
+                self.env.context.get("declaration_type", False) == "dispatches"
+                and int(self.env.context.get("declaration_year", 0)) >= 2022
+            ):
+                res.append("partner_vat")
         return res
 
 
@@ -190,34 +195,43 @@ class IntrastatProductComputationLine(models.Model):
 
     def _prepare_grouped_fields(self, fields_to_sum):
         vals = super()._prepare_grouped_fields(fields_to_sum)
-        vals["intrastat_state_id"] = self.intrastat_state_id.id
-        # TODO: Move set incoterm_id to intrastat_product
-        vals["incoterm_id"] = self.incoterm_id.id
-        if self.declaration_type == "dispatches" and int(self.parent_id.year) >= 2022:
-            vals["partner_vat"] = self.partner_vat
+        if self.company_id.country_id.code == "ES":
+            vals["intrastat_state_id"] = self.intrastat_state_id.id
+            # TODO: Move set incoterm_id to intrastat_product
+            vals["incoterm_id"] = self.incoterm_id.id
+            if (
+                self.declaration_type == "dispatches"
+                and int(self.parent_id.year) >= 2022
+            ):
+                vals["partner_vat"] = self.partner_vat
         return vals
 
     def _prepare_declaration_line(self):
         vals = super()._prepare_declaration_line()
-        # Avoid rounding in weight and fiscal value
-        vals["weight"] = 0.0
-        vals["amount_company_currency"] = 0.0
-        for computation_line in self:
-            vals["weight"] += computation_line["weight"]
-            vals["amount_company_currency"] += (
-                computation_line["amount_company_currency"]
-                + computation_line["amount_accessory_cost_company_currency"]
-            )
-        if not vals["weight"]:
-            vals["weight"] = 1
+        if self.company_id.country_id.code == "ES":
+            # Avoid rounding in weight and fiscal value
+            vals["weight"] = 0.0
+            vals["amount_company_currency"] = 0.0
+            for computation_line in self:
+                vals["weight"] += computation_line["weight"]
+                vals["amount_company_currency"] += (
+                    computation_line["amount_company_currency"]
+                    + computation_line["amount_accessory_cost_company_currency"]
+                )
+            if not vals["weight"]:
+                vals["weight"] = 1
         return vals
 
     @api.model
     def _group_line_hashcode_fields(self):
         res = super()._group_line_hashcode_fields()
-        res["intrastat_state_id"] = self.intrastat_state_id.id
-        if self.declaration_type == "dispatches" and int(self.parent_id.year) >= 2022:
-            res["partner_vat"] = self.partner_vat
+        if self.company_id.country_id.code == "ES":
+            res["intrastat_state_id"] = self.intrastat_state_id.id
+            if (
+                self.declaration_type == "dispatches"
+                and int(self.parent_id.year) >= 2022
+            ):
+                res["partner_vat"] = self.partner_vat
         return res
 
 

l10n_es_intrastat_report/views/l10n_es_intrastat_product.xml

@@ -172,6 +172,7 @@
         <field name="name">Spanish Intrastat Product Declaration</field>
         <field name="res_model">intrastat.product.declaration</field>
         <field name="view_mode">tree,form,graph</field>
+        <field name="domain">[("company_country_code", "=", "ES")]</field>
     </record>
     <menuitem
         id="l10n_es_intrastat_product_declaration_menu"