From aa2fd0b5235b9ef3741c6cbd26ed9c5f78a945a9 Mon Sep 17 00:00:00 2001 From: CarlosRoca13 Date: Mon, 14 Nov 2022 11:27:30 +0100 Subject: [PATCH] [IMP] account_*_stock_report_non_billed: Take care about discount when calculating amount to invoice --- .../models/stock_move.py | 9 ++++++--- .../models/stock_move.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/account_purchase_stock_report_non_billed/models/stock_move.py b/account_purchase_stock_report_non_billed/models/stock_move.py index a0f531a8..2101678f 100644 --- a/account_purchase_stock_report_non_billed/models/stock_move.py +++ b/account_purchase_stock_report_non_billed/models/stock_move.py @@ -63,9 +63,12 @@ class StockMove(models.Model): self.ensure_one() if self.purchase_line_id: self.quantity_not_invoiced = qty_to_invoice - invoiced_qty - self.price_not_invoiced = ( - qty_to_invoice - invoiced_qty - ) * self.purchase_line_id.price_unit + price_unit = self.purchase_line_id.price_unit + if "discount" in self.purchase_line_id._fields: + price_unit = self.purchase_line_id.price_unit * ( + 1 - self.purchase_line_id.discount / 100 + ) + self.price_not_invoiced = (qty_to_invoice - invoiced_qty) * price_unit else: super()._set_not_invoiced_values(qty_to_invoice, invoiced_qty) diff --git a/account_sale_stock_report_non_billed/models/stock_move.py b/account_sale_stock_report_non_billed/models/stock_move.py index 3a9fb0ec..0248ba07 100644 --- a/account_sale_stock_report_non_billed/models/stock_move.py +++ b/account_sale_stock_report_non_billed/models/stock_move.py @@ -105,7 +105,7 @@ class StockMove(models.Model): self.quantity_not_invoiced = qty_to_invoice - invoiced_qty self.price_not_invoiced = ( qty_to_invoice - invoiced_qty - ) * self.sale_line_id.price_unit + ) * self.sale_line_id.price_reduce @api.depends("sale_line_id") @api.depends_context("date_check_invoiced_moves")