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 PR #211 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-01-03 14:08:05 +00:00
parent 23c4f7e8b2 3c3e8ed38c
commit 10f34a29df
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -1171,7 +1171,7 @@ class IntrastatProductComputationLine(models.Model):
@api.onchange("src_dest_country_id")
def _onchange_src_dest_country_id(self):
self.src_dest_country_code = self.src_dest_country_id.code
if self.parent_id.year >= "2021":
if self.parent_id.year >= "2021" and self.src_dest_country_id:
self.src_dest_country_code = self.env[
"res.partner"
]._get_intrastat_country_code(country=self.src_dest_country_id)
@@ -1195,8 +1195,6 @@ class IntrastatProductComputationLine(models.Model):
def _onchange_product(self):
self.weight = 0.0
self.suppl_unit_qty = 0.0
self.intrastat_code_id = False
self.intrastat_unit_id = False
if self.product_id:
self.intrastat_code_id = self.product_id.intrastat_id
self.intrastat_unit_id = self.product_id.intrastat_id.intrastat_unit_id
@@ -1283,7 +1281,7 @@ class IntrastatProductDeclarationLine(models.Model):
@api.onchange("src_dest_country_id")
def _onchange_src_dest_country_id(self):
self.src_dest_country_code = self.src_dest_country_id.code
if self.parent_id.year >= "2021":
if self.parent_id.year >= "2021" and self.src_dest_country_id:
self.src_dest_country_code = self.env[
"res.partner"
]._get_intrastat_country_code(country=self.src_dest_country_id)

20
intrastat_product/tests/test_intrastat_product.py
View File

@@ -69,6 +69,26 @@ class TestIntrastatProduct(IntrastatProductCommon):
decl_copy = self.declaration.copy()
self.assertEqual(self.declaration.revision + 1, decl_copy.revision)
def test_declaration_manual_lines(self):
vals = {"declaration_type": "dispatches"}
self._create_declaration(vals)
computation_line_form = Form(
self.env["intrastat.product.computation.line"].with_context(
default_parent_id=self.declaration.id
)
)
computation_line_form.src_dest_country_code = "FR"
computation_line = computation_line_form.save()
self.assertEqual(computation_line.src_dest_country_code, "FR")
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 = "FR"
declaration_line = declaration_line_form.save()
self.assertEqual(declaration_line.src_dest_country_code, "FR")
def test_declaration_no_country(self):
self.demo_company.country_id = False
with self.assertRaises(ValidationError):