From d6e46390ebd4fc0f960e4a4329bf87e93f6aa38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 20 Jan 2022 19:00:53 +0100 Subject: [PATCH] Add packing weight to total weight of package issue11036 review384031002 --- stock.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index 04450bfda1..de05144e72 100644 --- a/stock.py +++ b/stock.py @@ -277,9 +277,20 @@ class Package(MeasurementsMixin, object, metaclass=PoolMeta): return move.to_location == location.id def get_total_measurements(self, name): + pool = Pool() + Uom = pool.get('product.uom') + ModelData = pool.get('ir.model.data') + + kg = Uom(ModelData.get_id('product', 'uom_kilogram')) + field = name[len('total_'):] measurement = ((getattr(self, field) or 0) + sum(p.get_total_measurements(name) for p in self.children)) - if name == 'total_weight' and self.additional_weight: - measurement += self.additional_weight + if name == 'total_weight': + if self.additional_weight: + measurement += self.additional_weight + if self.packaging_weight: + measurement += Uom.compute_qty( + self.packaging_weight_uom, self.packaging_weight, kg, + round=False) return measurement