From cfd829a6386493f0d714ade325627c3b9b36937a Mon Sep 17 00:00:00 2001
From: "luc.demeyer@noviat.com" <luc.demeyer@noviat.com>
Date: Thu, 9 Aug 2018 11:48:05 +0200
Subject: [PATCH] move methods to IntrastatProductDeclaration class

---
 .../models/intrastat_product_declaration.py   | 69 +++++++++++++++++--
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py
index 65cb165..f8639aa 100644
--- a/intrastat_product/models/intrastat_product_declaration.py
+++ b/intrastat_product/models/intrastat_product_declaration.py
@@ -678,6 +678,51 @@ class IntrastatProductDeclaration(models.Model):
         hashcode = '-'.join([unicode(f) for f in hc_fields.itervalues()])
         return hashcode
 
+    @api.model
+    def _prepare_grouped_fields(self, computation_line, fields_to_sum):
+        vals = {
+            'src_dest_country_id': computation_line.src_dest_country_id.id,
+            'intrastat_unit_id': computation_line.intrastat_unit_id.id,
+            'hs_code_id': computation_line.hs_code_id.id,
+            'transaction_id': computation_line.transaction_id.id,
+            'transport_id': computation_line.transport_id.id,
+            'region_id': computation_line.region_id.id,
+            'parent_id': computation_line.parent_id.id,
+            'product_origin_country_id':
+            computation_line.product_origin_country_id.id,
+            'amount_company_currency': 0.0,
+            }
+        for field in fields_to_sum:
+            vals[field] = 0.0
+        return vals
+
+    def _fields_to_sum(self):
+        fields_to_sum = [
+            'weight',
+            'suppl_unit_qty',
+            ]
+        return fields_to_sum
+
+    @api.model
+    def _prepare_declaration_line(self, computation_lines):
+        fields_to_sum = self._fields_to_sum()
+        vals = self._prepare_grouped_fields(
+            computation_lines[0], fields_to_sum)
+        for computation_line in computation_lines:
+            for field in fields_to_sum:
+                vals[field] += computation_line[field]
+            vals['amount_company_currency'] += (
+                computation_line['amount_company_currency'] +
+                computation_line['amount_accessory_cost_company_currency'])
+        # round, otherwise odoo with truncate (6.7 -> 6... instead of 7 !)
+        for field in fields_to_sum:
+            vals[field] = int(round(vals[field]))
+        if not vals['weight']:
+            vals['weight'] = 1
+        vals['amount_company_currency'] = int(round(
+            vals['amount_company_currency']))
+        return vals
+
     @api.multi
     def generate_declaration(self):
         """ generate declaration lines """
@@ -696,7 +741,7 @@ class IntrastatProductDeclaration(models.Model):
                 dl_group[hashcode] = [cl]
         ipdl = self.declaration_line_ids
         for cl_lines in dl_group.values():
-            vals = ipdl._prepare_declaration_line(cl_lines, self)
+            vals = self._prepare_declaration_line(cl_lines)
             declaration_line = ipdl.create(vals)
             for cl in cl_lines:
                 cl.write({'declaration_line_id': declaration_line.id})
@@ -890,8 +935,12 @@ class IntrastatProductDeclarationLine(models.Model):
         help="Country of origin of the product i.e. product 'made in ____'")
 
     @api.model
-    def _prepare_grouped_fields(self, computation_line, fields_to_sum,
-                                declaration):
+    def _prepare_grouped_fields(self, computation_line, fields_to_sum):
+        """
+        This method is DEPRECATED.
+        You should use the _prepare_grouped_fields method on the
+        IntrastatProductDeclaration class.
+        """
         vals = {
             'src_dest_country_id': computation_line.src_dest_country_id.id,
             'intrastat_unit_id': computation_line.intrastat_unit_id.id,
@@ -909,6 +958,11 @@ class IntrastatProductDeclarationLine(models.Model):
         return vals
 
     def _fields_to_sum(self):
+        """
+        This method is DEPRECATED.
+        You should use the _fields_to_sum method on the
+        IntrastatProductDeclaration class.
+        """
         fields_to_sum = [
             'weight',
             'suppl_unit_qty',
@@ -916,10 +970,15 @@ class IntrastatProductDeclarationLine(models.Model):
         return fields_to_sum
 
     @api.model
-    def _prepare_declaration_line(self, computation_lines, declaration):
+    def _prepare_declaration_line(self, computation_lines):
+        """
+        This method is DEPRECATED.
+        You should use the _fields_to_sum method on the
+        IntrastatProductDeclaration class.
+        """
         fields_to_sum = self._fields_to_sum()
         vals = self._prepare_grouped_fields(
-            computation_lines[0], fields_to_sum, declaration)
+            computation_lines[0], fields_to_sum)
         for computation_line in computation_lines:
             for field in fields_to_sum:
                 vals[field] += computation_line[field]