audrius/intrastat-extrastat
1
0
Fork 1
mirror of https://github.com/OCA/intrastat-extrastat.git synced 2025-02-16 17:13:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from OCA/8.0-fix-reporting-level

Browse Source 
[8.0][FIX]reporting level
This commit is contained in:
Luc De Meyer
2019-02-02 17:45:59 +01:00
committed by GitHub
parent d10e084202 17c61254ab
commit 76c7765f0f
1 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -1,26 +1,9 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Intrastat Product module for Odoo
# Copyright (C) 2011-2015 Akretion (http://www.akretion.com)
# Copyright (C) 2009-2015 Noviat (http://www.noviat.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
# @author Luc de Meyer <info@noviat.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright (C) 2011-2019 Akretion (http://www.akretion.com)
# Copyright (C) 2009-2019 Noviat (http://www.noviat.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
# @author Luc de Meyer <info@noviat.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openerp import models, fields, api, _
from openerp.exceptions import RedirectWarning, ValidationError
@@ -42,8 +25,8 @@ class IntrastatProductDeclaration(models.Model):
'state': {
'intrastat_product.declaration_done':
lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
}
}
}
@api.model
def _get_type(self):
@@ -126,8 +109,8 @@ class IntrastatProductDeclaration(models.Model):
(9, '09'),
(10, '10'),
(11, '11'),
(12, '12')
], string='Month', required=True,
(12, '12')],
string='Month', required=True,
default=_get_month)
year_month = fields.Char(
compute='_compute_year_month', string='Period', readonly=True,
@@ -166,8 +149,8 @@ class IntrastatProductDeclaration(models.Model):
string='Currency')
state = fields.Selection([
('draft', 'Draft'),
('done', 'Done'),
], string='State', readonly=True, track_visibility='onchange',
('done', 'Done')],
string='State', readonly=True, track_visibility='onchange',
copy=False, default='draft',
help="State of the declaration. When the state is set to 'Done', "
"the parameters become read-only.")
@@ -279,7 +262,7 @@ class IntrastatProductDeclaration(models.Model):
note = "\n" + _(
"Missing unit of measure on the line with %d "
"product(s) '%s' on invoice '%s'."
) % (line_qty, product.name_get()[0][1], invoice.number)
) % (line_qty, product.name_get()[0][1], invoice.number)
note += "\n" + _(
"Please adjust this line manually.")
self._note += note
@@ -291,12 +274,12 @@ class IntrastatProductDeclaration(models.Model):
note = "\n" + _(
"Conversion from Intrastat Supplementary Unit '%s' to "
"Unit of Measure is not implemented yet."
) % intrastat_unit_id.name
) % intrastat_unit_id.name
note += "\n" + _(
"Please correct the Intrastat Supplementary Unit "
"settings and regenerate the lines or adjust the lines "
"with Intrastat Code '%s' manually"
) % hs_code.display_name
) % hs_code.display_name
self._note += note
return weight, suppl_unit_qty
if target_uom.category_id == source_uom.category_id:
@@ -306,7 +289,7 @@ class IntrastatProductDeclaration(models.Model):
note = "\n" + _(
"Conversion from unit of measure '%s' to '%s' "
"is not implemented yet."
) % (source_uom.name, target_uom.name)
) % (source_uom.name, target_uom.name)
note += "\n" + _(
"Please correct the unit of measure settings and "
"regenerate the lines or adjust the impacted "
@@ -323,7 +306,7 @@ class IntrastatProductDeclaration(models.Model):
if not product.weight_net:
note = "\n" + _(
"Missing net weight on product %s."
) % product.name_get()[0][1]
) % product.name_get()[0][1]
note += "\n" + _(
"Please correct the product record and regenerate "
"the lines or adjust the impacted lines manually")
@@ -341,7 +324,7 @@ class IntrastatProductDeclaration(models.Model):
note = "\n" + _(
"Conversion from unit of measure '%s' to 'Kg' "
"is not implemented yet. It is needed for product '%s'."
) % (source_uom.name, product.name_get()[0][1])
) % (source_uom.name, product.name_get()[0][1])
note += "\n" + _(
"Please correct the unit of measure settings and "
"regenerate the lines or adjust the impacted lines "
@@ -591,14 +574,14 @@ class IntrastatProductDeclaration(models.Model):
'product_origin_country_id':
product_origin_country.id or False,
'region_id': region and region.id or False,
}
}
# extended declaration
if self._extended:
transport = self._get_transport(inv_line)
line_vals.update({
'transport_id': transport.id,
})
})
self._update_computation_line_vals(inv_line, line_vals)
@@ -634,7 +617,7 @@ class IntrastatProductDeclaration(models.Model):
'kg_uom': self.env.ref('product.product_uom_kgm'),
'pce_uom_categ': self.env.ref('product.product_uom_categ_unit'),
'pce_uom': self.env.ref('product.product_uom_unit')
}
}
return uom_refs[ref]
@api.multi
@@ -695,13 +678,58 @@ class IntrastatProductDeclaration(models.Model):
'region': computation_line.region_id.id or False,
'product_origin_country':
computation_line.product_origin_country_id.id or False,
}
}
def group_line_hashcode(self, computation_line):
hc_fields = self._group_line_hashcode_fields(computation_line)
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 """
@@ -720,7 +748,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)
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})
@@ -915,6 +943,11 @@ class IntrastatProductDeclarationLine(models.Model):
@api.model
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,
@@ -926,20 +959,30 @@ class IntrastatProductDeclarationLine(models.Model):
'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):
"""
This method is DEPRECATED.
You should use the _prepare_grouped_fields method on the
IntrastatProductDeclaration class.
"""
fields_to_sum = [
'weight',
'suppl_unit_qty',
]
]
return fields_to_sum
@api.model
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)