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

[12.0] fix _get_weight_and_supplunits

Browse Source
This commit is contained in:
Luc De Meyer
2019-12-19 14:57:52 +01:00
parent 13e2d3a006
commit 8887807c4b
2 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intrastat_product/data/intrastat_unit.xml
View File

@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
<!--
The standard addons do not have a uom for m3 although there is a
volume field in m3 on the product record.
By adding this uom we can use the standard product.product,volume
field to convert volume to weigth
-->
<record id="product_uom_m3" model="uom.uom">
<field name="name">m3</field>
<field name="category_id" ref="uom.product_uom_categ_vol"/>
<field name="factor_inv" eval="1000"/>
<field name="uom_type">bigger</field>
</record>
<!-- Extracted from the Official Journal of the European Union -->
<record id="intrastat_unit_c_k" model="intrastat.unit">
@@ -93,6 +106,7 @@
<record id="intrastat_unit_m3" model="intrastat.unit">
<field name="name">m3</field>
<field name="description">Cubic metre</field>
<field name="uom_id" ref="product_uom_m3"/>
</record>
<record id="intrastat_unit_1000m3" model="intrastat.unit">
<field name="name">1000 m3</field>

53
intrastat_product/models/intrastat_product_declaration.py
View File

@@ -226,6 +226,8 @@ class IntrastatProductDeclaration(models.Model):
kg_uom = self._get_uom_refs('kg_uom')
pce_uom_categ = self._get_uom_refs('pce_uom_categ')
pce_uom = self._get_uom_refs('pce_uom')
volume_uom_categ = self._get_uom_refs('volume_uom_categ')
m3_uom = self._get_uom_refs('m3_uom')
weight = suppl_unit_qty = 0.0
if not source_uom:
@@ -255,6 +257,29 @@ class IntrastatProductDeclaration(models.Model):
if target_uom.category_id == source_uom.category_id:
suppl_unit_qty = source_uom._compute_quantity(
line_qty, target_uom)
elif target_uom.category_id == volume_uom_categ:
# in case of product records with the volume field
# correctly filled in we should report back this
# volume (converted to the target_uom)
if not product.volume:
note = "\n" + _(
"Product '%s' has an Intrastat Supplementary Unit "
"in the 'volume' Unit of Measure (UoM) category. "
"The Supplementary Unit Quantity calculation "
"has failed since the product "
"has been sold/purchased with a UoM without "
"volume conversion. "
"There is also no 'volume' specificied on the "
"product record which also allows to calculate the "
"Intrastat Supplementary Unit."
) % product.name_get()[0][1]
note += "\n" + _(
"Please correct the product record and regenerate "
"the lines or adjust the impacted lines manually")
self._note += note
return weight, suppl_unit_qty
suppl_unit_qty = m3_uom._compute_quantity(
line_qty * product.volume, target_uom)
else:
note = "\n" + _(
"Conversion from unit of measure '%s' to '%s' "
@@ -290,16 +315,20 @@ class IntrastatProductDeclaration(models.Model):
weight = product.weight * \
source_uom._compute_quantity(line_qty, pce_uom)
else:
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])
note += "\n" + _(
"Please correct the unit of measure settings and "
"regenerate the lines or adjust the impacted lines "
"manually")
self._note += note
return weight, suppl_unit_qty
# in case of product records with e.g. uom 'liter' and the weight
# correctly filled in we should report back the weight
if not product.weight:
note = "\n" + _(
"Missing weight on product %s."
) % product.name_get()[0][1]
note += "\n" + _(
"Please correct the product record and regenerate "
"the lines or adjust the impacted lines manually")
self._note += note
return weight, suppl_unit_qty
qty = source_uom._compute_quantity(
line_qty, product.uom_id, raise_if_failure=False)
weight = product.weight * qty
return weight, suppl_unit_qty
@@ -588,7 +617,9 @@ class IntrastatProductDeclaration(models.Model):
'weight_uom_categ': self.env.ref('uom.product_uom_categ_kgm'),
'kg_uom': self.env.ref('uom.product_uom_kgm'),
'pce_uom_categ': self.env.ref('uom.product_uom_categ_unit'),
'pce_uom': self.env.ref('uom.product_uom_unit')
'pce_uom': self.env.ref('uom.product_uom_unit'),
'volume_uom_categ': self.env.ref('uom.product_uom_categ_vol'),
'm3_uom': self.env.ref('intrastat_product.product_uom_m3'),
}
return uom_refs[ref]