Merge PR #4109 into 16.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

l10n_es_intrastat_report/README.rst

@@ -161,6 +161,7 @@ Contributors
   * Pedro M. Baeza
   * João Marques
   * Víctor Martínez
+  * Juan Carlos Oñate
 
 * `Sygel <https://www.sygel.es>`__:
 

l10n_es_intrastat_report/models/l10n_es_intrastat_product_declaration.py

@@ -34,6 +34,8 @@ 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)
+        if self.company_id.country_id.code != "ES":
+            return result
         intrastat_state = self._get_intrastat_state(inv_line)
         if intrastat_state:
             line_vals["intrastat_state_id"] = intrastat_state.id
@@ -71,6 +73,8 @@ def _prepare_invoice_domain(self):
         - companies subject to arrivals or dispatches only
         """
         domain = super()._prepare_invoice_domain()[:-1]
+        if self.company_id.country_id.code != "ES":
+            return super()._prepare_invoice_domain()
         if self.declaration_type == "arrivals":
             domain.append(("move_type", "in", ("in_invoice", "out_refund")))
         elif self.declaration_type == "dispatches":
@@ -82,6 +86,8 @@ def _generate_xml(self):
 
     def _attach_xml_file(self, xml_string, declaration_name):
         attach_id = super()._attach_xml_file(xml_string, declaration_name)
+        if self.company_id.country_id.code != "ES":
+            return attach_id
         self.ensure_one()
         attach = self.env["ir.attachment"].browse(attach_id)
         filename = "{}_{}.csv".format(self.year_month, declaration_name)
@@ -158,19 +164,21 @@ def create_xls(self):
             "data": {"dynamic_report": True},
         }
 
-    @api.model
     def _xls_computation_line_fields(self):
         res = super()._xls_computation_line_fields()
+        if self.company_id.country_id.code != "ES":
+            return res
         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.company_id.country_id.code != "ES":
+            return res
         if (
             self.env.context.get("declaration_type", False) == "dispatches"
             and int(self.env.context.get("declaration_year", 0)) >= 2022
@@ -190,6 +198,8 @@ class IntrastatProductComputationLine(models.Model):
 
     def _prepare_grouped_fields(self, fields_to_sum):
         vals = super()._prepare_grouped_fields(fields_to_sum)
+        if self.company_id.country_id.code != "ES":
+            return vals
         vals["intrastat_state_id"] = self.intrastat_state_id.id
         # TODO: Move set incoterm_id to intrastat_product
         vals["incoterm_id"] = self.incoterm_id.id
@@ -199,6 +209,8 @@ def _prepare_grouped_fields(self, fields_to_sum):
 
     def _prepare_declaration_line(self):
         vals = super()._prepare_declaration_line()
+        if self.company_id.country_id.code != "ES":
+            return vals
         # Avoid rounding in weight and fiscal value
         vals["weight"] = 0.0
         vals["amount_company_currency"] = 0.0
@@ -215,6 +227,8 @@ def _prepare_declaration_line(self):
     @api.model
     def _group_line_hashcode_fields(self):
         res = super()._group_line_hashcode_fields()
+        if self.company_id.country_id.code != "ES":
+            return res
         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

l10n_es_intrastat_report/readme/CONTRIBUTORS.rst

@@ -7,6 +7,7 @@
   * Pedro M. Baeza
   * João Marques
   * Víctor Martínez
+  * Juan Carlos Oñate
 
 * `Sygel <https://www.sygel.es>`__:
 

l10n_es_intrastat_report/static/description/index.html

@@ -513,6 +513,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <li>Pedro M. Baeza</li>
 <li>João Marques</li>
 <li>Víctor Martínez</li>
+<li>Juan Carlos Oñate</li>
 </ul>
 </li>
 <li><a class="reference external" href="https://www.sygel.es">Sygel</a>:<ul>

l10n_es_intrastat_report/views/l10n_es_intrastat_product.xml

@@ -165,17 +165,4 @@
             </graph>
         </field>
     </record>
-    <record
-        id="l10n_es_intrastat_product_declaration_action"
-        model="ir.actions.act_window"
-    >
-        <field name="name">Spanish Intrastat Product Declaration</field>
-        <field name="res_model">intrastat.product.declaration</field>
-        <field name="view_mode">tree,form,graph</field>
-    </record>
-    <menuitem
-        id="l10n_es_intrastat_product_declaration_menu"
-        parent="intrastat_base.menu_intrastat_base_root"
-        action="l10n_es_intrastat_product_declaration_action"
-    />
 </odoo>