Merge lp:~unifield-team/unifield-server/us-71 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/initial_stock_inventory.py'
--- bin/addons/msf_doc_import/initial_stock_inventory.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_doc_import/initial_stock_inventory.py	2016-10-18 16:01:51 +0000
@@ -186,18 +186,12 @@
                     batch = str(batch)
                 try:
                     batch = batch.strip()
-                    if ',' in batch:
-                        bad_batch_name = True
-                        batch_name = False
+                    batch_ids = batch_obj.search(cr, uid, [('product_id', '=', product_id), ('name', '=', batch)], context=context)
+                    if not batch_ids:
+                        batch_name = batch
                         batch = False
                         to_correct_ok = True
                     else:
-                        batch_ids = batch_obj.search(cr, uid, [('product_id', '=', product_id), ('name', '=', batch)], context=context)
-                        if not batch_ids:
-                            batch_name = batch
-                            batch = False
-                            to_correct_ok = True
-                        else:
                             batch = batch_ids[0]
                 except Exception:
                     batch = False
@@ -707,16 +701,6 @@
 
             # Batch
             batch = row.cells[4].data
-            if batch:
-                try:
-                    batch = batch.strip()
-                    batch_name = batch
-                    if ',' in batch_name:
-                        batch_name = False
-                        batch = False
-                        bad_batch_name = True
-                except Exception:
-                    pass
 
             # Expiry date
             if row.cells[5].data: