[17.0][FIX] intrastat_product: set the correct country code for Greece

Check correct country code for Greece. The correct is EL instead of GR.

Author: almumu

intrastat_product/models/intrastat_product_declaration.py

@@ -16,6 +16,17 @@
 _logger = logging.getLogger(__name__)
 
 
+SRC_DEST_COUNTRY_CODE_MAPPING = {
+    "GB": "XI",
+    "GR": "EL",
+}
+
+PRODUCT_ORIGIN_COUNTRY_CODE_MAPPING = {
+    "GB": "XU",
+    "GR": "EL",
+}
+
+
 class IntrastatProductDeclaration(models.Model):
     _name = "intrastat.product.declaration"
     _description = "Intrastat Product Declaration"
@@ -1105,8 +1116,7 @@ def _compute_region_code(self):
     def _compute_src_dest_country_code(self):
         for this in self:
             code = this.src_dest_country_id and this.src_dest_country_id.code or False
-            if code == "GB":
-                code = "XI"  # Northern Ireland
+            code = SRC_DEST_COUNTRY_CODE_MAPPING.get(code, code)
             this.src_dest_country_code = code
 
     @api.depends("product_origin_country_id")
@@ -1117,10 +1127,7 @@ def _compute_product_origin_country_code(self):
                 and this.product_origin_country_id.code
                 or False
             )
-            if code == "GB":
-                code = "XU"
-                # XU can be used when you don't know if the product
-                # originate from Great-Britain or from Northern Ireland
+            code = PRODUCT_ORIGIN_COUNTRY_CODE_MAPPING.get(code, code)
             this.product_origin_country_code = code
 
     @api.constrains("vat")

intrastat_product/tests/test_intrastat_product.py

@@ -96,6 +96,31 @@ def test_declaration_manual_lines(self):
         declaration_line = declaration_line_form.save()
         self.assertEqual(declaration_line.src_dest_country_code, "FR")
 
+        # Test Greece country code conversion
+        computation_line_form = Form(
+            self.env["intrastat.product.computation.line"].with_context(
+                default_parent_id=self.declaration.id
+            )
+        )
+        computation_line_form.src_dest_country_id = self.env.ref("base.gr")
+        computation_line_form.transaction_id = self.transaction
+        computation_line_form.hs_code_id = self.hs_code_computer
+        computation_line_form.region_code = "ZZ"
+        computation_line_form.product_origin_country_code = "BE"
+        computation_line_form.transport_id = self.env.ref(
+            "intrastat_product.intrastat_transport_3"
+        )
+        computation_line = computation_line_form.save()
+        self.assertEqual(computation_line.src_dest_country_code, "EL")
+        declaration_line_form = Form(
+            self.env["intrastat.product.declaration.line"].with_context(
+                default_parent_id=self.declaration.id
+            )
+        )
+        declaration_line_form.src_dest_country_code = "EL"
+        declaration_line = declaration_line_form.save()
+        self.assertEqual(declaration_line.src_dest_country_code, "EL")
+
     def test_declaration_no_country(self):
         self.demo_company.country_id = False
         with self.assertRaises(ValidationError):