Merge lp:~dorian-kemps/unifield-server/US-6965 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2020-01-06 11:38:19 +0000
+++ bin/addons/stock/physical_inventory.py	2020-01-27 10:41:25 +0000
@@ -600,27 +600,19 @@
                                          ('state', '=', 'done')]
 
         moves_at_location_ids = move_obj.search(cr, uid, move_for_products_at_location, context=context)
-        moves_at_location = move_obj.read(cr, uid, moves_at_location_ids,
-                                          ["product_id",
-                                           "product_qty",
-                                           "prodlot_id",
-                                           "expired_date",
-                                           "location_id",
-                                           "product_uom",
-                                           "location_dest_id"],
-                                          context=context)
+        ftf = ["product_id", "product_qty", "prodlot_id", "expired_date", "location_id", "product_uom", "location_dest_id"]
+        moves_at_location = move_obj.browse(cr, uid, moves_at_location_ids, fields_to_fetch=ftf, context=context)
 
         # Sum all lines to get a set of (product, batchnumber) -> qty
         stocks = {}
         for move in moves_at_location:
 
-            product_id = move["product_id"][0]
-            product_qty = move["product_qty"]
-            batch_number = move["prodlot_id"][1] if move["prodlot_id"] else False
-            expiry_date = move["expired_date"]
+            product_id = move.product_id.id
+            product_qty = move.product_qty
+            batch_number = move.prodlot_id and move.prodlot_id.name or False
+            expiry_date = move.expired_date
 
-            # Dirty hack to ignore/hide internal batch numbers ("MSFBN")
-            if batch_number and batch_number.startswith("MSFBN"):
+            if batch_number and move.prodlot_id.type == 'internal':
                 batch_number = False
 
             product_batch_expirydate = (product_id, batch_number, expiry_date)
@@ -630,14 +622,14 @@
             if not product_batch_expirydate in stocks.keys():
                 stocks[product_batch_expirydate] = 0.0
 
-            move_out = (move["location_id"][0] == location_id)
-            move_in = (move["location_dest_id"][0] == location_id)
+            move_out = (move.location_id.id == location_id)
+            move_in = (move.location_dest_id.id == location_id)
 
             if move_in and move_out:
                 continue
 
-            if move['product_uom'] and default_uom.get(product_id) and move['product_uom'][0] != default_uom[product_id]:
-                product_qty = uom_obj._compute_qty(cr, uid, move['product_uom'][0], product_qty, default_uom[product_id])
+            if move.product_uom and default_uom.get(product_id) and move.product_uom.id != default_uom[product_id]:
+                product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, product_qty, default_uom[product_id])
 
             if move_in:
                 stocks[product_batch_expirydate] += product_qty

=== modified file 'bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py'
--- bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py	2020-01-06 11:38:19 +0000
+++ bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py	2020-01-27 10:41:25 +0000
@@ -135,7 +135,6 @@
         if context is None:
             context = {}
 
-
         prod_info = {}
         move_obj = self.pool.get('stock.move')
         prod_obj = self.pool.get('product.product')
@@ -162,11 +161,10 @@
 
         move_ids = move_obj.search(cr, uid, domain, context=context)
 
-        for move in move_obj.read(cr, uid, move_ids, ['product_id', 'prodlot_id', 'expired_date']):
-            product_id = move["product_id"][0]
-
-
-            if move['prodlot_id'] and move["prodlot_id"][1].startswith("MSFBN"):
+        for move in move_obj.browse(cr, uid, move_ids, fields_to_fetch=['product_id', 'prodlot_id', 'expired_date'], context=context):
+            product_id = move.product_id.id
+
+            if move.prodlot_id and move.prodlot_id.type == 'internal':
                 if prod_info.get(product_id, {}).get('batch_management'):
                     # old move when product was ED only, now it's BN so ignore the move
                     continue
@@ -175,10 +173,10 @@
                 if not prod_info.get(product_id, {}).get('batch_management'):
                     # old move when this product was BN, now it's ED only so ignore this stock move
                     continue
-                batch_number = move["prodlot_id"][1]
+                batch_number = move.prodlot_id.name
 
             key = (product_id, default_code_dict.get(product_id))
-            BN_and_ED[key].add((batch_number, move["expired_date"], move["prodlot_id"][0]))
+            BN_and_ED[key].add((batch_number, move.expired_date, move.prodlot_id.id))
 
         return BN_and_ED