Merge lp:~mallorymarcot/unifield-server/us-5097 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-01-30 13:17:55 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-02-06 14:38:20 +0000
@@ -102578,6 +102578,11 @@
 msgid "Commitment Voucher Number"
 msgstr "Numéro du Bon d'Engagement"
 
+#. module: stock
+#: code:addons/stock/physical_inventory.py:907
+#, python-format
+msgid "Unable to update line #%s product %s: line not found in the discrepancy report"
+msgstr "Impossible de mettre à jour la ligne #%s produit %s: ligne correspondante non trouvée dans le rapport d'écarts"=======
 #. module: account_mcdb
 #: code:addons/account_mcdb/account_mcdb.py:1494
 #, python-format
 
=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2018-12-03 08:36:11 +0000
+++ bin/addons/stock/physical_inventory.py	2019-02-06 14:38:20 +0000
@@ -898,8 +898,19 @@
                           row_index, len(row))
                 break
 
+            product_code = row.cells[2].data
+            line_no = row.cells[0].data
+            # check if line number and product code are matching together
+            product_id = product_obj.search(cr, uid, [('default_code', '=like', product_code)], context=context)
+            disc_line_found = self.pool.get('physical.inventory.discrepancy').search(cr, uid, [
+                ('inventory_id', '=', inventory_rec.id),
+                ('line_no', '=', int(line_no)),
+                ('product_id', 'in', product_id),
+            ], context=context)
+            if not disc_line_found:
+                add_error(_("""Unable to update line #%s product %s: line not found in the discrepancy report""") % (line_no, product_code), row_index, 2)
+
             # Check if product is non-stockable
-            product_code = row.cells[2].data
             if product_obj.search_exist(cr, uid, [('default_code', '=like', product_code),
                                                   ('type', 'in', ['service_recep', 'consu'])],
                                         context=context):
@@ -924,7 +935,6 @@
 
             comment = row.cells[19].data
 
-            line_no = row.cells[0].data
             line_ids = discrepancy_obj.search(cr, uid, [('inventory_id', '=', inventory_rec.id), ('line_no', '=', line_no)])
             if line_ids:
                 line_no = line_ids[0]