Merge lp:~unifield-team/unifield-wm/us-698 into lp:unifield-wm

[jftempo]

=== modified file 'msf_doc_import/check_line.py'
--- msf_doc_import/check_line.py	2015-11-10 09:13:05 +0000
+++ msf_doc_import/check_line.py	2016-01-19 10:40:32 +0000
@@ -479,6 +479,7 @@
     date_format = kwargs['date_format']
     error_list = kwargs['to_write']['error_list']
     warning_list = kwargs['to_write']['warning_list']
+    picking_type = kwargs.get('picking_type', 'internal')
     batch_name = None
     expiry_date = None
     batch_number = None
@@ -504,8 +505,14 @@
                     error_list.append(_('The expiry date doesn\'t match with the expiry date of the batch. Batch not selected'))
                 else:
                     error_list.append(_('The expiry date doesn\'t match with the expiry date of the batch. Expiry date not selected'))
+            elif bn_mgmt and picking_type == 'in':
+                bn_ids = [bn_obj.create(cr, uid, {
+                    'product_id': product_id,
+                    'name': batch_name,
+                    'life_date': expiry_date.strftime('%Y-%m-%d'),
+                })]
             else:
-                error_list.append(_('Batch not found.'))
+                error_list.append(_('Batch not found'))
     elif not bn_ids and product_id and expiry_date:
         if bn_mgmt:
             error_list.append(_('The Batch number is not set.'))

=== modified file 'msf_doc_import/wizard/wizard_import_picking_line.py'
--- msf_doc_import/wizard/wizard_import_picking_line.py	2015-11-23 16:52:52 +0000
+++ msf_doc_import/wizard/wizard_import_picking_line.py	2016-01-19 10:40:32 +0000
@@ -230,7 +230,8 @@
                                                                                 product_obj=product_obj,
                                                                                 bn_cell_nb=6, ed_cell_nb=7, 
                                                                                 date_format=date_format,
-                                                                                product_id=to_write.get('product_id'),)
+                                                                                product_id=to_write.get('product_id'),
+                                                                                picking_type=picking.type)
 
                             # Create the internal batch number if not exists
                             if not product.batch_management and product.perishable and batch_value['expired_date'] and not batch_value['prodlot_id'] and not batch_value['error_list']: