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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-02-19 14:49:35 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-02-25 14:57:39 +0000
@@ -62807,12 +62807,13 @@
 msgid "Virgin Islands (British)"
 msgstr "Iles Vierges (Britanniques)"
 
-#. modules: msf_doc_import, kit, sale
+#. modules: msf_doc_import, kit, sale, msf_supply_doc_export
 #: code:addons/kit/wizard/kit_mass_import.py:210
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:527
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:540
 #: code:addons/sale/wizard/internal_request_import.py:162
 #: code:addons/sale/wizard/internal_request_import.py:222
+#: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:330
 #, python-format
 msgid "No file to import"
 msgstr "Aucun fichier à importer"
@@ -105002,13 +105003,13 @@
 #. module: msf_supply_doc_export
 #: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:209
 #, python-format
-msgid "Line %s: Given batch number with this expiry date doesn't exists in database"
+msgid "Line %s: The given batch number with this expiry date doesn't exist in database"
 msgstr "Ligne %s: Le numéro de lot avec cette date d'expiration n'existe pas en base"
 
 #. module: msf_supply_doc_export
 #: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:222
 #, python-format
-msgid "Line %s: Given expiry date doesn't exists in database"
+msgid "Line %s: The given expiry date doesn't exist in database"
 msgstr "Ligne %s: La date d'expiration donnée n'existe pas en base"
 
 #. module: msf_doc_import
@@ -105310,3 +105311,21 @@
 #, python-format
 msgid "Document date (%s) should be in posting date FY"
 msgstr "La date du document (%s) doit être dans le même exercice comptable que la date de comptabilisation"
+
+#. module: msf_supply_doc_export
+#: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:84
+#, python-format
+msgid "Line %s: Column \"Qty Picked\" must be a number"
+msgstr "Ligne %s: La Colonne \"Qté prélevée\" doit être un nombre"
+
+#. module: msf_supply_doc_export
+#: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:95
+#, python-format
+msgid "Line %s: Column \"Qty to Pick\" must be a number"
+msgstr "Ligne %s: La Colonne \"Qté à prélever\" doit être un nombre"
+
+#. module: msf_supply_doc_export
+#: code:addons/msf_supply_doc_export/wizard/wizard_pick_import.py:346
+#, python-format
+msgid "File line %s: Column \"Item\" must be an integer"
+msgstr "Fichier ligne %s: La Colonne \"Article\" doit être un entier"

=== modified file 'bin/addons/msf_supply_doc_export/report/report_pick_export_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_pick_export_xls.mako	2019-01-29 10:21:42 +0000
+++ bin/addons/msf_supply_doc_export/report/report_pick_export_xls.mako	2019-02-25 14:57:39 +0000
@@ -169,11 +169,15 @@
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.sale_line_id and move.sale_line_id.product_id != move.product_id and '[%s] %s' % (move.product_id.default_code, move.product_id.name) or '' | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.comment or '' | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.location_id.name or '' | x}</Data></Cell>
-          <Cell ss:StyleID="line" ><Data ss:Type="String">${formatLang(getStock(m) or 0.00) | x}</Data></Cell>
+          <Cell ss:StyleID="line" ><Data ss:Type="Number">${getStock(move) or 0.00}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="Number">${move.product_qty or 0.00 | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${0 | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.prodlot_id and move.prodlot_id.name or '' | x}</Data></Cell>
-          <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${move.expired_date or '' | n}T00:00:00.000</Data></Cell>
+          % if move.expired_date and isDate(move.expired_date):
+            <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${move.expired_date or '' | n}T00:00:00.000</Data></Cell>
+          % else:
+            <Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
+          % endif
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.kc_check and _('Yes') or '' | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.dg_check and _('Yes') or '' | x}</Data></Cell>
           <Cell ss:StyleID="line" ><Data ss:Type="String">${move.np_check and _('Yes') or '' | x}</Data></Cell>

=== modified file 'bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py'
--- bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2019-02-15 10:46:11 +0000
+++ bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2019-02-25 14:57:39 +0000
@@ -60,6 +60,7 @@
     'cs',
 ]
 
+
 class wizard_pick_import(osv.osv_memory):
     _name = 'wizard.pick.import'
     _description = 'PICK import wizard'
@@ -68,24 +69,33 @@
         'picking_id': fields.many2one('stock.picking', string="PICK ref", required=True),
         'picking_processor_id': fields.many2one('create.picking.processor', string="PICK processor ref"),
         'validate_processor_id': fields.many2one('validate.picking.processor', string="PICK processor ref"),
-        'import_file': fields.binary('PICK import file'),
+        'import_file': fields.binary('PICK import file', required=True),
     }
 
-
-    def normalize_data(self, cr, uid, data, xls_line_number):
-        if 'qty_picked' in data: # set to float
+    def normalize_data(self, cr, uid, data):
+        if 'qty_picked' in data:  # set to float
             if not data['qty_picked']:
                 data['qty_picked'] = 0.0
             if isinstance(data['qty_picked'], (str,unicode)):
-                data['qty_picked'] = float(data['qty_picked'])
+                try:
+                    data['qty_picked'] = float(data['qty_picked'])
+                except:
+                    raise osv.except_osv(
+                        _('Error'), _('Line %s: Column "Qty Picked" must be a number') % data['item']
+                    )
 
-        if 'qty_to_pick' in data: # set to float
+        if 'qty_to_pick' in data:  # set to float
             if not data['qty_to_pick']:
                 data['qty_to_pick'] = 0.0
             if isinstance(data['qty_to_pick'], (str,unicode)):
-                data['qty_to_pick'] = float(data['qty_to_pick'])
+                try:
+                    data['qty_to_pick'] = float(data['qty_to_pick'])
+                except:
+                    raise osv.except_osv(
+                        _('Error'), _('Line %s: Column "Qty to Pick" must be a number') % data['item']
+                    )
 
-        if 'batch' in data: #  set to str
+        if 'batch' in data:  # set to str
             if not data['batch']:
                 data['batch'] = ''
 
@@ -97,18 +107,17 @@
                     data['expiry_date'] = datetime(data['expiry_date'].year, data['expiry_date'].month, data['expiry_date'].day)
                 except:
                     raise osv.except_osv(
-                        _('Error'), _('Line %s: Column "Expiry Date" must be a date') % xls_line_number
+                        _('Error'), _('Line %s: Column "Expiry Date" must be a date') % data['item']
                     )
 
         if data['qty_picked'] > data['qty_to_pick']:
             raise osv.except_osv(
                 _('Error'),
-                _('Line %s: Column "Qty Picked" cannot be greater than "Qty to pick"') % xls_line_number
+                _('Line %s: Column "Qty Picked" cannot be greater than "Qty to pick"') % data['item']
             )
 
         return data
 
-
     def cancel(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -125,7 +134,6 @@
             'context': context,
         }
 
-
     def get_matching_move(self, cr, uid, ids, wizard_id, move_proc_model, xls_line_number, line_data, product_id, location_id, picking_id, context=None):
         if context is None:
             context = {}
@@ -191,28 +199,26 @@
             else:
                 raise osv.except_osv(
                     _('Error'),
-                    _('Line %s: Matching move not found') % xls_line_number
+                    _('Line %s: Matching move not found') % line_data['item']
                 )
 
         return move_proc_ids[0]
 
-
-    def checks_on_batch(self, cr, uid, ids, move_proc, line_data, xls_line_number, context=None):
+    def checks_on_batch(self, cr, uid, ids, move_proc, line_data, context=None):
         if context is None:
             context = {}
 
         if move_proc.product_id.batch_management and not line_data['batch']:
             raise osv.except_osv(
                 _('Error'),
-                _('Line %s: Product is batch number mandatory and no batch number is given') % xls_line_number
+                _('Line %s: Product is batch number mandatory and no batch number is given') % line_data['item']
             )
         if not move_proc.product_id.batch_management and move_proc.product_id.perishable and not line_data['expiry_date']:
             raise osv.except_osv(
                 _('Error'),
-                _('Line %s: Product is expiry date mandatory and no expiry date is given') % xls_line_number
+                _('Line %s: Product is expiry date mandatory and no expiry date is given') % line_data['item']
             )
 
-
     def get_import_data(self, cr, uid, ids, import_file, context=None):
         if context is None:
             context = {}
@@ -289,7 +295,7 @@
 
         import_data = {}
         for xls_line_number, line_data in sorted(import_data_lines.items()):
-            line_data = self.normalize_data(cr, uid, line_data, xls_line_number)
+            line_data = self.normalize_data(cr, uid, line_data)
 
             if line_data['item'] in ln_with_cancelled: # ignore cancelled/done lines
                 product_id = self.get_product_id(cr, uid, ids, line_data, context=context)
@@ -315,12 +321,13 @@
                     _('The total quantity of line #%s in the import file doesn\'t match with the total qty on screen') % ln
                 )
 
-
     def import_pick_xls(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
 
         wiz = self.browse(cr, uid, ids[0], context=context)
+        if not wiz.import_file:
+            raise osv.except_osv(_('Error'), _('No file to import'))
         import_file = SpreadsheetXML(xmlstring=base64.decodestring(wiz.import_file))
         res_model = 'create.picking.processor' if wiz.picking_processor_id else 'validate.picking.processor'
         move_proc_model = 'create.picking.move.processor' if wiz.picking_processor_id else 'validate.move.processor'
@@ -335,10 +342,15 @@
         self.check_matching_qty_per_line_number(cr, uid, ids, import_data_lines, wiz, context=context)
 
         for xls_line_number, line_data in sorted(import_data_lines.items()):
+            try:
+                line_data['item'] = int(line_data['item'])
+            except:
+                raise osv.except_osv(_('Error'), _('File line %s: Column "Item" must be an integer') % xls_line_number)
+
             if line_data['qty_picked'] is None:
-                raise osv.except_osv(_('Error'), _('Line %s: Column "Qty Picked" should contains the quantity to process and cannot be empty, please fill it with "0" instead') % xls_line_number)
+                raise osv.except_osv(_('Error'), _('Line %s: Column "Qty Picked" should contains the quantity to process and cannot be empty, please fill it with "0" instead') % line_data['item'])
 
-            line_data = self.normalize_data(cr, uid, line_data, xls_line_number)
+            line_data = self.normalize_data(cr, uid, line_data)
 
             if line_data['qty_picked'] and line_data['qty_to_pick']:
                 product_id = self.get_product_id(cr, uid, ids, line_data, context=context)
@@ -350,7 +362,7 @@
                 move_proc = self.pool.get(move_proc_model).browse(cr, uid, move_proc_id, context=context)
                 to_write = {}
 
-                self.checks_on_batch(cr, uid, ids, move_proc, line_data, xls_line_number, context=context)
+                self.checks_on_batch(cr, uid, ids, move_proc, line_data, context=context)
 
                 to_write['quantity'] = line_data['qty_picked']
 
@@ -366,12 +378,12 @@
                         else:
                             raise osv.except_osv(
                                 _('Error'),
-                                _('Line %s: Given batch number with this expiry date doesn\'t exists in database') % xls_line_number
+                                _('Line %s: The given batch number with this expiry date doesn\'t exist in database') % line_data['item']
                             )
                     else:
                         raise osv.except_osv(_('Error'),
                                              _('Line %s: Product %s must have a batch number and an expiry date')
-                                             % (xls_line_number, line_data['code']))
+                                             % (line_data['item'], line_data['code']))
                 elif not move_proc.product_id.batch_management and move_proc.product_id.perishable and line_data['expiry_date']:
                     prodlot_ids = self.pool.get('stock.production.lot').search(cr, uid, [
                         ('life_date', '=', line_data['expiry_date']),
@@ -383,7 +395,7 @@
                     else:
                         raise osv.except_osv(
                             _('Error'),
-                            _('Line %s: Given expiry date doesn\'t exists in database') % xls_line_number
+                            _('Line %s: The given expiry date doesn\'t exist in database') % line_data['item']
                         )
 
                 self.pool.get(move_proc_model).write(cr, uid, [move_proc.id], to_write, context=context)