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

Merge PR #218 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-09-02 08:42:08 +00:00
parent dd95adb573 b6d4cb3e86
commit 9dd5392bd5
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stock_picking_report_valued/models/stock_move_line.py
View File

@@ -21,7 +21,9 @@ class StockMoveLine(models.Model):
related="sale_line.tax_id", readonly=True, string="Sale Tax" related="sale_line.tax_id", readonly=True, string="Sale Tax"
) )
sale_price_unit = fields.Float( sale_price_unit = fields.Float(
related="sale_line.price_unit", readonly=True, string="Sale price unit" compute="_compute_sale_order_line_fields",
readonly=True,
string="Sale price unit",
) )
sale_discount = fields.Float( sale_discount = fields.Float(
related="sale_line.discount", readonly=True, string="Sale discount (%)" related="sale_line.discount", readonly=True, string="Sale discount (%)"
@@ -54,6 +56,7 @@ class StockMoveLine(models.Model):
for line in self: for line in self:
quantity = line._get_report_valued_quantity() quantity = line._get_report_valued_quantity()
valued_line = line.sale_line valued_line = line.sale_line
sale_line_uom = valued_line.product_uom
# If order line quantity don't match with move line quantity compute values # If order line quantity don't match with move line quantity compute values
if float_compare( if float_compare(
quantity, quantity,
@@ -68,6 +71,10 @@ class StockMoveLine(models.Model):
valued_line.product_uom_qty = quantity valued_line.product_uom_qty = quantity
# Force original price unit to avoid pricelist recomputed (not needed) # Force original price unit to avoid pricelist recomputed (not needed)
valued_line.price_unit = line.sale_line.price_unit valued_line.price_unit = line.sale_line.price_unit
if sale_line_uom != line.product_uom_id:
valued_line.price_unit = sale_line_uom._compute_price(
valued_line.price_unit, line.product_uom_id
)
line.update( line.update(
{ {
"sale_tax_description": ", ".join( "sale_tax_description": ", ".join(
@@ -76,5 +83,6 @@ class StockMoveLine(models.Model):
"sale_price_subtotal": valued_line.price_subtotal, "sale_price_subtotal": valued_line.price_subtotal,
"sale_price_tax": valued_line.price_tax, "sale_price_tax": valued_line.price_tax,
"sale_price_total": valued_line.price_total, "sale_price_total": valued_line.price_total,
"sale_price_unit": valued_line.price_unit,
} }
) )