[FIX] intrastat_product: fix notedict access to avoid adding elements when not needed and fix pre-commit

Author: MarinaAForgeFlow

intrastat_product/models/intrastat_product_declaration.py

@@ -576,6 +576,7 @@ def _is_product(self, invoice_line):
     def _gather_invoices_init(self, notedict):
         """placeholder for localization modules"""
 
+    # flake8: noqa: C901
     def _gather_invoices(self, notedict):
         lines = []
         qty_prec = self.env["decimal.precision"].precision_get(
@@ -637,6 +638,9 @@ def _gather_invoices(self, notedict):
                 partner_country = self._get_partner_country(
                     inv_line, notedict, eu_countries
                 )
+                if notedict["inv_origin"] in notedict["invoice"]:
+                    continue
+
                 # When the country is the same as the company's country must be skipped.
                 if partner_country == self.company_id.country_id:
                     _logger.info(
@@ -652,12 +656,10 @@ def _gather_invoices(self, notedict):
                 if inv_intrastat_line:
                     hs_code = inv_intrastat_line.hs_code_id
                 elif inv_line.product_id and self._is_product(inv_line):
-                    hs_code = inv_line.product_id.get_hs_code_recursively()
-                    if not hs_code:
-                        msg = _("Missing <em>H.S. Code</em>")
-                        notedict["product"][inv_line.product_id.display_name][msg].add(
-                            notedict["invline_origin"]
-                        )
+                    hs_code = self._get_product_hs_code(inv_line, notedict)
+                    if notedict["invline_origin"] in notedict["product"].get(
+                        inv_line.product_id.display_name, {}
+                    ).get("Missing <em>H.S. Code</em>", {}):
                         continue
                 else:
                     _logger.info(
@@ -712,8 +714,12 @@ def _gather_invoices(self, notedict):
                     "suppl_unit_qty": suppl_unit_qty,
                     "amount_company_currency": amount_company_currency,
                     "amount_accessory_cost_company_currency": 0.0,
-                    "transaction_id": intrastat_transaction.id,
-                    "product_origin_country_id": product_origin_country.id or False,
+                    "transaction_id": intrastat_transaction
+                    and intrastat_transaction.id
+                    or False,
+                    "product_origin_country_id": product_origin_country
+                    and product_origin_country.id
+                    or False,
                     "region_code": region_code or region.code,
                     "region_id": region and region.id or False,
                     "partner_id": partner.id,