From e2e05b146cd869416cb4ae0dd16b9ebe9ce4cefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 9 Oct 2023 18:31:37 +0200 Subject: [PATCH] Use purchase line unit when invoice line has no unit Closes #12462 --- modules/purchase/purchase.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py index 0491faba2c..34d67f527d 100644 --- a/modules/purchase/purchase.py +++ b/modules/purchase/purchase.py @@ -1743,8 +1743,9 @@ class Line(sequence_ordered(), ModelSQL, ModelView): if invoice_line.type != 'line': continue if invoice_line not in skips: - quantity += Uom.compute_qty(invoice_line.unit, - invoice_line.quantity, self.unit) + quantity += Uom.compute_qty( + invoice_line.unit or self.unit, invoice_line.quantity, + self.unit) return quantity def _get_invoice_line_moves(self): @@ -1864,13 +1865,14 @@ class Line(sequence_ordered(), ModelSQL, ModelView): moved_quantity *= -1 invoiced_quantity = 0 for invoice_line in self.invoice_lines: - if ( - (not invoice_line.invoice - or invoice_line.invoice.state != 'cancelled') - and self.unit and invoice_line.unit): - invoiced_quantity += Uom.compute_qty( - invoice_line.unit, invoice_line.quantity, self.unit, - round=False) + if (not invoice_line.invoice + or invoice_line.invoice.state != 'cancelled'): + if self.unit: + invoiced_quantity += Uom.compute_qty( + invoice_line.unit or self.unit, invoice_line.quantity, + self.unit, round=False) + else: + invoiced_quantity += invoice_line.quantity actual_quantity = max(moved_quantity, invoiced_quantity, key=abs) if self.unit: actual_quantity = self.unit.round(actual_quantity)