From c3cdfa9510b148caee33fce0f64b969663eba322 Mon Sep 17 00:00:00 2001
From: Raimon Esteve <raimonesteve@gmail.com>
Date: Mon, 14 Sep 2020 21:37:56 +0200
Subject: [PATCH] Filter moves that has multiple moves and different lot
 #041406

---
 production.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/production.py b/production.py
index ed1115d..f2bd4fc 100644
--- a/production.py
+++ b/production.py
@@ -22,14 +22,16 @@ _ZERO = 0.0
 class Production(metaclass=PoolMeta):
     __name__ = 'production'
 
-    def mass_balance_report_data(self, requested_product, direction):
+    def mass_balance_report_data(self, requested_product, direction, lot=None):
         Uom = Pool().get('product.uom')
 
         digits = self.on_change_with_unit_digits()
-
         quantity = 0.0
         for move in getattr(self, 'outputs' if direction == 'backward' else 'inputs'):
            if move.product == requested_product:
+               # skip moves that same product but different lot
+               if lot and lot != move.lot:
+                   continue
                quantity += Uom.compute_qty(move.uom, move.quantity, move.product.default_uom, True)
 
         moves = {}
@@ -57,12 +59,11 @@ class Production(metaclass=PoolMeta):
                 balance_plan_consumption = balance_difference = balance_difference_percent = 0.0
                 if self.bom:
                     bom = self.bom
-                    uom = self.uom
                     for bm in bom.inputs:
                         if bm.product == product:
                             default_uom = self.product.default_uom
                             bqty = Uom.compute_qty(
-                                uom, bm.quantity, default_uom, True)
+                                bm.uom, bm.quantity, bm.product.default_uom, True)
                             factor = bom.compute_factor(self.product, bqty, default_uom)
                             balance_plan_consumption = default_uom.ceil(self.quantity * factor)
                             break
@@ -84,12 +85,11 @@ class Production(metaclass=PoolMeta):
                 balance_plan_consumption = balance_difference = balance_difference_percent = 0.0
                 if self.bom:
                     bom = self.bom
-                    uom = self.uom
                     for bm in bom.inputs:
                         if bm.product == requested_product:
                             default_uom = self.product.default_uom
                             bqty = Uom.compute_qty(
-                                uom, bm.quantity, default_uom, True)
+                                bm.uom, bm.quantity, bm.product.default_uom, True)
                             factor = bom.compute_factor(self.product, bqty, default_uom)
                             balance_plan_consumption = default_uom.ceil(self.quantity * factor)
                             break
@@ -249,6 +249,7 @@ class PrintProductionMassBalanceReport(HTMLReport):
 
         requested_product = Product(data['product'])
         direction = data['direction']
+        lot = Lot(data['lot']) if data.get('lot') else None
 
         parameters = {}
         parameters['direction'] = direction
@@ -256,7 +257,7 @@ class PrintProductionMassBalanceReport(HTMLReport):
         parameters['to_date'] = to_date
         parameters['show_date'] = bool(data.get('from_date'))
         parameters['requested_product'] = requested_product
-        parameters['lot'] = Lot(data['lot']) if data.get('lot') else None
+        parameters['lot'] = lot
 
         # TODO get url from trytond.url issue8767
         if BASE_URL:
@@ -281,8 +282,8 @@ class PrintProductionMassBalanceReport(HTMLReport):
                     ('outputs.state', '=', 'done'),
                     ('company', '=', company_id),
                     ]
-            if data.get('lot'):
-                domain += [('outputs.lot', '=', data['lot'])]
+            if lot:
+                domain += [('outputs.lot', '=', lot)]
         else:
             domain = [
                     ('inputs.product', '=', requested_product),
@@ -291,14 +292,15 @@ class PrintProductionMassBalanceReport(HTMLReport):
                     ('inputs.state', '=', 'done'),
                     ('company', '=', company_id),
                     ]
-            if data.get('lot'):
-                domain += [('inputs.lot', '=', data['lot'])]
+            if lot:
+                domain += [('inputs.lot', '=', lot)]
 
         productions = Production.search(domain)
 
         records = {}
         for production in productions:
-            res = production.mass_balance_report_data(requested_product, direction)
+            res = production.mass_balance_report_data(requested_product,
+                    direction, lot)
 
             for key, values in res.items():
                 if not records.get(key):