[ADD] l10n_it_intrastat: aggiunto paese di origine su prodotto e categoria

Author: Borruso

l10n_it_intrastat/models/account.py

@@ -152,11 +152,18 @@ def _prepare_intrastat_line_country_good_origin(self, res):
 
     def _prepare_intrastat_line_country_origin(self, res):
         self.ensure_one()
-        country_origin_id = self.env["res.country"].browse()
-        if self.move_id.is_sale_document():
-            country_origin_id = self.move_id.company_id.partner_id.country_id
-        elif self.move_id.is_purchase_document():
-            country_origin_id = self.move_id.partner_id.country_id
+        if self.mapped("product_id.product_tmpl_id.intrastat_origin_country_id"):
+            country_origin_id = (
+                self.product_id.product_tmpl_id.intrastat_origin_country_id
+            )
+        elif self.mapped(
+            "product_id.product_tmpl_id.categ_id.intrastat_origin_country_id"
+        ):
+            country_origin_id = (
+                self.product_id.product_tmpl_id.categ_id.intrastat_origin_country_id
+            )
+        else:
+            country_origin_id = self.env["res.country"].browse()
         res.update({"country_origin_id": country_origin_id.id})
 
     def _prepare_intrastat_line_delivery(self, company_id, res):

l10n_it_intrastat/models/product.py

@@ -10,6 +10,9 @@ class ProductCategory(models.Model):
     intrastat_code_id = fields.Many2one(
         "report.intrastat.code", string="Nomenclature Code"
     )
+    intrastat_origin_country_id = fields.Many2one(
+        "res.country", string="Origin Country"
+    )
     intrastat_type = fields.Selection(
         [
             ("good", "Goods"),
@@ -27,6 +30,9 @@ class ProductTemplate(models.Model):
     intrastat_code_id = fields.Many2one(
         comodel_name="report.intrastat.code", string="Intrastat Code"
     )
+    intrastat_origin_country_id = fields.Many2one(
+        "res.country", string="Origin Country"
+    )
     intrastat_type = fields.Selection(
         selection=[
             ("good", "Goods"),
@@ -44,12 +50,20 @@ def get_intrastat_data(self):
         - Intrastat Code on product template
         - Intrastat Code on product category
         """
-        res = {"intrastat_code_id": False, "intrastat_type": False}
+        res = {
+            "intrastat_code_id": False,
+            "intrastat_origin_country_id": False,
+            "intrastat_type": False,
+        }
         # From Product
         if self.intrastat_type:
             res["intrastat_code_id"] = self.intrastat_code_id.id
+            res["intrastat_origin_country_id"] = self.intrastat_origin_country_id.id
             res["intrastat_type"] = self.intrastat_type
         elif self.categ_id and self.categ_id.intrastat_code_id:
             res["intrastat_code_id"] = self.categ_id.intrastat_code_id.id
+            res[
+                "intrastat_origin_country_id"
+            ] = self.categ_id.intrastat_origin_country_id.id
             res["intrastat_type"] = self.categ_id.intrastat_type
         return res

l10n_it_intrastat/views/product.xml

@@ -17,6 +17,7 @@
                             attrs="{'invisible':[('intrastat_type','!=', 'good'),('intrastat_type','!=', 'service')],
                                     'required':[('intrastat_type','in', ['good', 'service'])]}"
                         />
+                            <field name="intrastat_origin_country_id" />
                       </group>
 
                     </group>
@@ -38,6 +39,7 @@
                             attrs="{'invisible':[('intrastat_type','!=', 'good'),('intrastat_type','!=', 'service')],
                                     'required':[('intrastat_type','in', ['good', 'service'])]}"
                         />
+                            <field name="intrastat_origin_country_id" />
                         </group>
                     </group>
                 </xpath>