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

[14.0]improved brexit support - keep backwards compatibility with localisation modules

Browse Source
This commit is contained in:
Luc De Meyer
2022-05-03 09:34:34 +02:00
committed by Víctor Martínez
parent 179f0289d1
commit 7db852c32d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
intrastat_product/models/account_move.py
View File

@@ -1,5 +1,5 @@
# Copyright 2011-2020 Akretion France (http://www.akretion.com)
# Copyright 2009-2021 Noviat (http://www.noviat.com)
# Copyright 2009-2022 Noviat (http://www.noviat.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
# @author Luc de Meyer <info@noviat.com>
@@ -94,16 +94,21 @@ class AccountMove(models.Model):
if not hs_code:
return vals
weight, qty = decl_model._get_weight_and_supplunits(line, hs_code, notedict)
product_origin_country = line.product_id.origin_country_id
product_origin_country_code = decl_model._get_product_origin_country_code(
line, product_origin_country
)
product_country = line.product_id.origin_country_id
product_state = line.product_id.origin_state_id
country = product_country or product_state.country_id
product_origin_country_code = "QU"
if country:
product_origin_country_code = self.env[
"res.partner"
]._get_intrastat_country_code(product_country, product_state)
vals.update(
{
"invoice_line_id": line.id,
"hs_code_id": hs_code.id,
"transaction_weight": int(weight),
"transaction_suppl_unit_qty": qty,
"product_origin_country_id": line.product_id.origin_country_id.id,
"product_origin_country_code": product_origin_country_code,
}
)

7
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -489,6 +489,13 @@ class IntrastatProductDeclaration(models.Model):
self._account_config_warning(msg)
return incoterm
def _get_product_origin_country(self, inv_line, notedict):
_logger.warning(
"Method '_get_product_origin_country' is deprecated, "
"please use '_get_product_origin_country_code'."
)
return inv_line.product_id.origin_country_id
def _get_product_origin_country_code(
self, inv_line, product_origin_country, notedict
):