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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/abstract_wizard_import.py'
--- bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2016-08-03 14:52:14 +0000
+++ bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2017-01-16 10:08:29 +0000
@@ -82,7 +82,8 @@
         d = False
         for dformat in date_format:
             try:
-                d = str(DateTime.strptime(date_value, dformat))
+                d = DateTime.strptime(date_value, dformat)
+                d = d.strftime('%Y-%m-%d %H:%M:%S')
             except ValueError:
                 continue
 
@@ -363,7 +364,14 @@
 
         file_obj.getNbRows()
         # iterator on rows
-        return file_obj.getRows(), file_obj.getNbRows()
+        try:
+            res = file_obj.getRows(), file_obj.getNbRows()
+            return res
+        except TypeError as e:
+            raise osv.except_osv(
+                _('Error'),
+                _('An error occurs during the reading of the file. Please contact an administrator and give him the import file and this error: %s') % e,
+            )
 
     def check_headers(self, headers_row, headers_title, context=None):
         """
@@ -454,4 +462,4 @@
 
         return p_ids[0]
 
-abstract_wizard_import()
\ No newline at end of file
+abstract_wizard_import()

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_batch.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_batch.py	2016-09-05 12:33:07 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_batch.py	2017-01-16 10:08:29 +0000
@@ -24,6 +24,8 @@
 
 import pooler
 
+from datetime import datetime
+
 from osv import osv
 from tools.translate import _
 
@@ -128,6 +130,7 @@
         prodlot_obj = self.pool.get('stock.production.lot')
         product_obj = self.pool.get('product.product')
         sequence_obj = self.pool.get('ir.sequence')
+        date_tools = self.pool.get('date.tools')
 
         if context is None:
             context = {}
@@ -170,13 +173,13 @@
             # Product
             product_id = None
             try:
-                product_id = self.get_product_by_default_code(cr, uid, get_cell(line_data, 'product_id'),
+                product_id = self.get_product_by_default_code(cr, uid, get_cell(line_data, 'product_id').strip(),
                                                               context=context)
             except UnifieldImportException as e:
                 save_error(e)
 
             # Batch number type
-            batch_type = get_cell(line_data, 'type')
+            batch_type = get_cell(line_data, 'type').strip()
             if batch_type.upper() not in (_('Standard').upper(), _('Internal').upper()):
                 save_error(
                     _('The Type of the batch number should be \'Standard\' or \'Internal\''),
@@ -192,8 +195,17 @@
                 continue
 
             # Make consistency checks
-            name = get_cell(line_data, 'name')
+            name = get_cell(line_data, 'name').strip()
             life_date = get_cell(line_data, 'life_date')
+            if life_date and datetime.strptime(life_date, '%Y-%m-%d %H:%M:%S') < datetime(1900, 01, 01, 0, 0, 0):
+                date_format = date_tools.get_date_format(cr, uid, context=context)
+                save_error(
+                    _('You cannot create a batch number with an expiry date before %s') % (
+                        datetime(1900, 01, 01, 0, 0, 0).strftime(date_format),
+                    ),
+                )
+                continue
+
             product_brw = product_obj.read(cr, uid, product_id, ['batch_management', 'perishable'], context=context)
 
             if not product_brw['batch_management'] and not product_brw['perishable']: