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 #189 into 13.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-08-10 09:13:48 +00:00
parent 7e8ccc0ce6 de293936a6
commit a7a03d1ab7
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -336,7 +336,7 @@ class IntrastatProductDeclaration(models.Model):
if not source_uom:
line_notes = [_("Missing unit of measure.")]
self._note += self._format_line_note(inv_line, notedict, line_notes)
self._format_line_note(inv_line, notedict, line_notes)
return weight, suppl_unit_qty
if intrastat_unit_id:
@@ -350,7 +350,7 @@ class IntrastatProductDeclaration(models.Model):
)
% intrastat_unit_id.name,
]
self._note += self._format_line_note(inv_line, notedict, line_notes)
self._format_line_note(inv_line, notedict, line_notes)
return weight, suppl_unit_qty
if target_uom.category_id == source_uom.category_id:
suppl_unit_qty = source_uom._compute_quantity(line_qty, target_uom)
@@ -362,7 +362,7 @@ class IntrastatProductDeclaration(models.Model):
)
% (source_uom.name, target_uom.name)
]
self._note += self._format_line_note(inv_line, notedict, line_notes)
self._format_line_note(inv_line, notedict, line_notes)
return weight, suppl_unit_qty
if weight:
@@ -377,7 +377,7 @@ class IntrastatProductDeclaration(models.Model):
line_notes = [
_("Missing weight on product %s.") % product.name_get()[0][1]
]
self._note += self._format_line_note(inv_line, notedict, line_notes)
self._format_line_note(inv_line, notedict, line_notes)
return weight, suppl_unit_qty
if source_uom == pce_uom:
weight = product.weight * line_qty # product.weight_net
@@ -396,7 +396,7 @@ class IntrastatProductDeclaration(models.Model):
)
% (source_uom.name, product.name_get()[0][1])
]
self._note += self._format_line_note(inv_line, notedict, line_notes)
self._format_line_note(inv_line, notedict, line_notes)
return weight, suppl_unit_qty
return weight, suppl_unit_qty
@@ -638,9 +638,7 @@ class IntrastatProductDeclaration(models.Model):
_("Missing Intrastat Code on product %s. ")
% (inv_line.product_id.name_get()[0][1])
]
self._note += self._format_line_note(
inv_line, notedict, line_notes
)
self._format_line_note(inv_line, notedict, line_notes)
continue
else:
_logger.info(