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

[jftempo]

[lp:~dorian-kemps/unifield-server/US-10168]

6262. By Dorian on 2022-07-01

US-10168 [FIX] FO line import: headers are case incensitive now

6263. By Dorian on 2022-07-18

US-10168 [FIX] IN VI import: removed the case sensitivity on the packing headers. Stock Out import: Qty missed will be empty if data beyond days of stock out

6264. By Dorian on 2022-07-21

US-10168 [FIX] IN VI import: Fixed the header checks for P/P/S

=== modified file 'bin/addons/kit/wizard/kit_mass_import.py'
--- bin/addons/kit/wizard/kit_mass_import.py	2020-10-21 14:16:24 +0000
+++ bin/addons/kit/wizard/kit_mass_import.py	2022-07-21 13:40:33 +0000
@@ -601,7 +601,6 @@
 
         return True
 
-
     def _get_record(self, cr, uid, field, value, model, cache=None):
         """
         Search in cache or fill the cache with the ID of the db.
@@ -610,9 +609,7 @@
             cache = {}
 
         if value not in cache:
-            record_ids = self.pool.get(model).search(cr, uid, [
-                (field, '=', value),
-            ])
+            record_ids = self.pool.get(model).search(cr, uid, [(field, '=ilike', value)])
             if record_ids:
                 cache[value] = record_ids[0]
             else:

=== modified file 'bin/addons/msf_doc_import/check_line.py'
--- bin/addons/msf_doc_import/check_line.py	2022-05-10 14:16:17 +0000
+++ bin/addons/msf_doc_import/check_line.py	2022-07-21 13:40:33 +0000
@@ -290,8 +290,8 @@
         if row.cells[cell_nb] and row.cells[cell_nb].data:
             product_code = row.cells[cell_nb].data
             if product_code and row.cells[cell_nb].type == 'str':
-                product_code = product_code.strip()
-                p_ids = product_obj.search(cr, uid, [('default_code', '=ilike', product_code)], context=context)
+                product_code = product_code.strip().upper()
+                p_ids = product_obj.search(cr, uid, [('default_code', '=', product_code)], context=context)
                 if not p_ids:
                     comment += _(' Code: %s') % (product_code)
                     msg = _('Product code %s doesn\'t exist in the DB.') % product_code

=== modified file 'bin/addons/msf_doc_import/stock_cost_reevaluation.py'
--- bin/addons/msf_doc_import/stock_cost_reevaluation.py	2015-07-15 11:57:19 +0000
+++ bin/addons/msf_doc_import/stock_cost_reevaluation.py	2022-07-21 13:40:33 +0000
@@ -123,7 +123,7 @@
 
             # Currency
             currency_name = row.cells[3].data
-            if not currency_name or currency_name != comp_currency_name:
+            if not currency_name or currency_name.lower() != comp_currency_name.lower():
                 raise osv.except_osv(_('Error'),
                 _("The Product [%s] %s is not in company currency. Company currency is '%s' and the product currency is '%s'.") % (
                 product_code or '', product_name or '', comp_currency_name, currency_name or '', ))

=== modified file 'bin/addons/msf_doc_import/wizard/abstract_wizard_import.py'
--- bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2021-07-07 16:30:21 +0000
+++ bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2022-07-21 13:40:33 +0000
@@ -475,12 +475,11 @@
         :return: The ID of the product.product
         """
         p_obj = self.pool.get('product.product')
-        p_ids = p_obj.search(cr, uid, [
-            ('default_code', '=', default_code),
-        ], limit=1, order='NO_ORDER', context=context)
+        p_ids = p_obj.search(cr, uid, [('default_code', '=ilike', default_code)], limit=1, order='NO_ORDER', context=context)
         if not p_ids:
             raise UnifieldImportException(_('No product found for the code \'%s\'') % default_code)
 
         return p_ids[0]
 
+
 abstract_wizard_import()

=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
--- bin/addons/msf_doc_import/wizard/wiz_common_import.py	2022-05-02 09:01:40 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py	2022-07-21 13:40:33 +0000
@@ -74,33 +74,32 @@
             cell_data = row.cells[cell_nb].data
         return cell_data
 
-    def get_header_index(self, cr, uid, ids, row, error_list, line_num, context):
+    def get_header_index(self, cr, uid, ids, row, error_list, line_num, origin=False, context=None):
         """
         Return dict with {'header_name0': header_index0, 'header_name1': header_index1...}
         """
+        if context is None:
+            context = {}
         header_dict = {}
         for cell_nb in range(len(row.cells)):
-            header_dict.update({self.get_cell_data(cr, uid, ids, row, cell_nb, error_list, line_num, context): cell_nb})
+            col_name = self.get_cell_data(cr, uid, ids, row, cell_nb, error_list, line_num, context)
+            if col_name and origin == 'PO':
+                col_name = col_name.lower()
+            header_dict.update({col_name: cell_nb})
         return header_dict
 
-    def check_header_values(self, cr, uid, ids, context, header_index,
-                            real_columns, origin=False, ignore_case=False):
+    def check_header_values(self, cr, uid, ids, context, header_index, real_columns, origin=False):
         """
         Check that the columns in the header will be taken into account.
         """
         translated_headers = [_(f) for f in real_columns]
-        upper_translated_headers = translated_headers
-        if origin == 'FO' or ignore_case:
-            upper_translated_headers = [_(f).upper() for f in real_columns]
-        for k,v in header_index.items():
-            upper_k = k
-            if k and (origin == 'FO' or ignore_case):
-                upper_k = k.upper()
+        upper_translated_headers = [_(f).upper() for f in real_columns]
+        for k, v in header_index.items():
+            upper_k = k and k.upper() or ''
             if upper_k not in upper_translated_headers:
                 if origin:
                     # special case from document origin
-                    if origin == 'PO' and k == _('Delivery requested date') \
-                            and 'Delivery Request Date' in real_columns:
+                    if origin == 'PO' and k == _('Delivery requested date') and 'Delivery Request Date' in real_columns:
                         continue  # 'Delivery requested date' tolerated (for Rfq vs 'Delivery Requested Date' of PO_COLUMNS_HEADER_FOR_IMPORT)
                 vals = {'state': 'draft',
                         'message': _('The column "%s" is not taken into account. Please correct it. The list of columns accepted is: %s'

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ad_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_ad_line.py	2022-02-18 16:02:20 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_ad_line.py	2022-07-21 13:40:33 +0000
@@ -95,7 +95,7 @@
             ''', (doc.id, ))  # not_a_user_entry
 
             for x in cr.fetchall():
-                key = (x[1], x[2])
+                key = (x[1], x[2].lower())
                 current_line_add.setdefault(key, []).append(x)
 
 
@@ -122,7 +122,7 @@
 
             for row in ws.rows:
                 if len(row) > percentage_col:
-                    key = (row[0].value, row[1].value)
+                    key = (row[0].value, row[1].value.lower())
                     if not row[0].value or not row[1].value:
                         # empty line
                         continue

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py	2022-05-10 09:08:50 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py	2022-07-21 13:40:33 +0000
@@ -126,10 +126,9 @@
                         if h_name != 'State' or len(header_row) != mandatory_col_count:
                             tr_header_row = _(tools.ustr(header_row[i]))
                             tr_h_name = _(h_name)
-                            if len(header_row) > i and tr_header_row != tr_h_name:
+                            if len(header_row) > i and tr_header_row.upper() != tr_h_name.upper():
                                 header_error = True
-                                if tr_header_row.upper() == tr_h_name.upper():
-                                    error_list.append(_("\n\tPlease check spelling on column '%s'.") % tr_header_row)
+                                error_list.append(_("\n\tPlease check spelling on column '%s'.") % tr_header_row)
 
                 if header_error:
                     msg = _("\n\tYou can not import this file because the header of columns doesn't match with the expected headers: %s") % ','.join([_(x) for x in columns_for_fo_line_import])
@@ -177,7 +176,7 @@
                         col_count = len(row)
                         template_col_count = len(header_index.items())
                         if col_count != template_col_count and col_count != mandatory_col_count:
-                            message += _("""Line %s in the Excel file: You should have exactly %s columns in this order: %s \n""") % (line_num, template_col_count,','.join(columns_for_fo_line_import))
+                            message += _("""Line %s in the Excel file: You should have exactly %s columns in this order: %s \n""") % (line_num, template_col_count,', '.join(columns_for_fo_line_import))
                             line_with_error.append(wiz_common_import.get_line_values(cr, uid, ids, row, cell_nb=False, error_list=error_list, line_num=line_num, context=context))
                             ignore_lines += 1
                             line_ignored_num.append(line_num)

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2021-11-10 16:14:10 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2022-07-21 13:40:33 +0000
@@ -337,9 +337,8 @@
                 header_index = wiz_common_import.get_header_index(
                     cr, uid, ids, first_row, error_list=[], line_num=0, context=context)
                 context.update({'invoice_id': invoice_id, 'header_index': header_index})
-                res, res1 = wiz_common_import.check_header_values(
-                    cr, uid, ids, context, header_index,
-                    columns_for_account_line_import)
+                res, res1 = wiz_common_import.check_header_values(cr, uid, ids, context, header_index,
+                                                                  columns_for_account_line_import)
                 if not res:
                     return self.write(cr, uid, ids, res1, context)
             except osv.except_osv as osv_error:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2022-05-10 14:16:17 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2022-07-21 13:40:33 +0000
@@ -186,18 +186,17 @@
                             total_line_num -= 1
                             continue
 
-
                         # Cell 0 : Line Number (RfQ)
                         if is_rfq:
                             ln_value = check_line.line_number_value(
-                                row=row, cell_nb=header_index[_('Line Number')], to_write=to_write, context=context)
+                                row=row, cell_nb=header_index[_('line number')], to_write=to_write, context=context)
                             to_write.update(
                                 line_number=ln_value['line_number'],
                                 error_list=ln_value['error_list'])
 
                         # Cell 1: Product Code
                         p_value = check_line.product_value(
-                            cr, uid, obj_data=obj_data, cell_nb=header_index[_('Product Code')],
+                            cr, uid, obj_data=obj_data, cell_nb=header_index[_('product code')],
                             product_obj=product_obj, row=row, to_write=to_write, context=context)
                         to_write.update(
                             default_code=p_value['default_code'],
@@ -209,7 +208,7 @@
 
                         # Cell 2: Quantity
                         qty_value = check_line.quantity_value(
-                            product_obj=product_obj, cell_nb=header_index[_('Quantity')],
+                            product_obj=product_obj, cell_nb=header_index[_('quantity')],
                             row=row, to_write=to_write, max_qty=max_qty, context=context)
                         to_write.update(
                             product_qty=qty_value['product_qty'],
@@ -218,7 +217,7 @@
 
                         # Cell 3: UOM
                         uom_value = check_line.compute_uom_value(
-                            cr, uid, obj_data=obj_data, cell_nb=header_index[_('UoM')], product_obj=product_obj,
+                            cr, uid, obj_data=obj_data, cell_nb=header_index[_('uom')], product_obj=product_obj,
                             uom_obj=uom_obj, row=row, to_write=to_write, context=context)
                         to_write.update(
                             product_uom=uom_value['uom_id'],
@@ -236,7 +235,7 @@
 
                         # Cell 4: Price
                         price_value = check_line.compute_price_value(
-                            row=row, to_write=to_write, cell_nb=header_index[_('Price')], price='Cost Price',
+                            row=row, to_write=to_write, cell_nb=header_index[_('price')], price='Cost Price',
                             is_rfq=is_rfq, context=context)
                         to_write.update(
                             price_unit=price_value['price_unit'],
@@ -246,7 +245,7 @@
 
                         # Cell 5: Requested Delivery Date
                         # for Rfq 'Requested Delivery Date' tolerated (5th column)
-                        cell_nb = header_index[_('Requested Delivery Date')] if _('Requested Delivery Date') in header_index else 6
+                        cell_nb = header_index[_('requested delivery date')] if _('requested delivery date') in header_index else 6
                         date_value = check_line.compute_date_value(
                             cell_nb=cell_nb, row=row, to_write=to_write, context=context)
                         to_write.update(
@@ -255,7 +254,7 @@
 
                         # Cell 7: Confirmed Delivery Date
                         if is_rfq:
-                            cell_nb = header_index[_('Confirmed Delivery Date')] if _('Confirmed Delivery Date') in header_index else 7
+                            cell_nb = header_index[_('confirmed delivery date')] if _('confirmed delivery date') in header_index else 7
                             cdd_value = check_line.compute_confirmed_delivery_date_value(
                                 cell_nb=cell_nb, row=row, to_write=to_write, context=context)
                             to_write.update(
@@ -264,7 +263,7 @@
 
                         # Cell 6: Currency
                         curr_value = check_line.compute_currency_value(
-                            cr, uid, cell_nb=header_index[_('Currency')], browse_purchase=wiz.po_id,
+                            cr, uid, cell_nb=header_index[_('currency')], browse_purchase=wiz.po_id,
                             currency_obj=currency_obj, row=row, to_write=to_write, context=context)
                         to_write.update(
                             functional_currency_id=curr_value['functional_currency_id'],
@@ -272,7 +271,7 @@
 
                         # Cell 7: Comment
                         c_value = check_line.comment_value(
-                            row=row, cell_nb=header_index[_('Comment')], to_write=to_write, context=context)
+                            row=row, cell_nb=header_index[_('comment')], to_write=to_write, context=context)
                         to_write.update(
                             comment=c_value['comment'],
                             warning_list=c_value['warning_list'])
@@ -462,7 +461,7 @@
                 # get first line
                 first_row = next(reader_iterator)
                 header_index = wiz_common_import.get_header_index(
-                    cr, uid, ids, first_row, error_list=[], line_num=0, context=context)
+                    cr, uid, ids, first_row, error_list=[], line_num=0, origin='PO', context=context)
                 context.update({'po_id': po_id, 'header_index': header_index})
                 rfq = purchase_obj.read(cr, uid, po_id, ['state', 'rfq_ok'], context=context)
                 is_rfq = rfq['rfq_ok']

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py	2022-03-08 13:43:59 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py	2022-07-21 13:40:33 +0000
@@ -275,7 +275,7 @@
                                 ('id', 'not in', treated_lines),
                                 ('picking_id', '=', wiz_browse.picking_id.id),
                                 ('line_number', '=', imp_line_num),
-                                ('product_id.default_code', '=', row.cells[1].data),
+                                ('product_id.default_code', '=', row.cells[1].data.upper()),
                                 ('state', '=', 'assigned'),
                             ]
                             if row.cells[5].data:
@@ -527,7 +527,7 @@
                         get_header_index(cr, uid, ids, next(reader_iterator), error_list=[], line_num=0, context=context)
                 context.update({'picking_id': picking_id, 'header_index': header_index})
                 res, res1 = wiz_common_import.\
-                    check_header_values(cr, uid, ids, context, header_index, ppl_columns_lines_for_import, ignore_case=True)
+                    check_header_values(cr, uid, ids, context, header_index, ppl_columns_lines_for_import)
                 if not res:
                     return self.write(cr, uid, ids, res1, context)
             except osv.except_osv as osv_error:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py	2021-08-16 13:37:04 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py	2022-07-21 13:40:33 +0000
@@ -205,7 +205,7 @@
                     else:
                         try:
                             product_code = product_code.strip()
-                            code_ids = product_obj.search(cr, uid, [('default_code', '=', product_code)])
+                            code_ids = product_obj.search(cr, uid, [('default_code', '=ilike', product_code)])
                             if not code_ids:
                                 default_code = obj_data.get_object_reference(cr, uid, 'msf_doc_import','product_tbd')[1]
                                 to_correct_ok = True
@@ -227,7 +227,7 @@
                     else:
                         try:
                             uom_name = p_uom.strip()
-                            uom_ids = uom_obj.search(cr, uid, [('name', '=', uom_name)], context=context)
+                            uom_ids = uom_obj.search(cr, uid, [('name', '=ilike', uom_name)], context=context)
                             if not uom_ids:
                                 uom_id = obj_data.get_object_reference(cr, uid, 'msf_doc_import','uom_tbd')[1]
                                 error_list_line.append(_("The UoM '%s' was not found.") % uom_name)

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2022-03-16 16:37:36 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2022-07-21 13:40:33 +0000
@@ -448,7 +448,8 @@
         for row in rows:
             index += 1
             values.setdefault(index, [])
-            if len(row) > 2 and row[1] and row[1].data == PACK_HEADER[1][0]:
+            if len(row) > 2 and row[1] and row[1].data and (row[1].data == PACK_HEADER[1][0] or
+                    (row[1].type == 'str' and row[1].data.lower() == PACK_HEADER[1][0].lower())):
                 # this line is for pack header
                 nb_pack += 1
                 for nb, x in enumerate(PACK_HEADER):
@@ -1533,13 +1534,12 @@
             else:
                 prod_id = False
                 if values.get('product_code'):
+                    values['product_code'] = values['product_code'].upper()
                     prod_id = PRODUCT_CODE_ID.get(values['product_code'])
 
                 if not prod_id and values['product_code']:
                     stripped_product_code = values['product_code'].strip()
-                    prod_ids = prod_obj.search(cr, uid,
-                                               [('default_code', '=', stripped_product_code)],
-                                               context=context)
+                    prod_ids = prod_obj.search(cr, uid, [('default_code', '=ilike', stripped_product_code)], context=context)
                     if not prod_ids:
                         # if we didn't manage to link our product code with existing product in DB, we cannot continue checks
                         # because it needs the product id:
@@ -1586,12 +1586,12 @@
 
             # UoM
             uom_value = values.get('product_uom')
-            if tools.ustr(uom_value) == line.move_uom_id.name:
+            if uom_value and line.move_uom_id and tools.ustr(uom_value.lower()) == line.move_uom_id.name.lower():
                 write_vals['imp_uom_id'] = line.move_uom_id.id
             else:
                 uom_id = UOM_NAME_ID.get(tools.ustr(uom_value))
                 if not uom_id:
-                    uom_ids = uom_obj.search(cr, uid, [('name', '=', tools.ustr(uom_value))], context=context)
+                    uom_ids = uom_obj.search(cr, uid, [('name', '=ilike', tools.ustr(uom_value))], context=context)
                     if uom_ids:
                         write_vals['imp_uom_id'] = uom_ids[0]
                     else:
@@ -1631,7 +1631,7 @@
 
             if line_currency:
                 write_vals['imp_currency_id'] = line_currency.id
-                if tools.ustr(currency_value) != line_currency.name:
+                if tools.ustr(currency_value.upper()) != line_currency.name.upper():
                     err_msg = _('The currency on the Excel file is not the same as the currency of the IN line - You must have the same currency on both side - Currency of the initial line kept.')
                     errors.append(err_msg)
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2022-03-21 11:06:44 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2022-07-21 13:40:33 +0000
@@ -1552,7 +1552,7 @@
             else:
                 if values[2]:
                     if not PRODUCT_CODE_ID.get(values[2]):
-                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=', values[2])], context=context)
+                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=ilike', values[2])], context=context)
                         if prod_ids:
                             PRODUCT_CODE_ID[values[2]] = prod_ids[0]
                         else:
@@ -1605,9 +1605,9 @@
             else:
                 uom_id = UOM_NAME_ID.get(tools.ustr(uom_value))
                 if not uom_id:
-                    uom_ids = uom_obj.search(cr, uid, [('name', '=', tools.ustr(uom_value))], context=context)
+                    uom_ids = uom_obj.search(cr, uid, [('name', '=ilike', tools.ustr(uom_value))], context=context)
                     if uom_ids:
-                        UOM_NAME_ID[tools.ustr(uom_value)] =  uom_ids[0]
+                        UOM_NAME_ID[tools.ustr(uom_value)] = uom_ids[0]
                         write_vals['imp_uom'] = uom_ids[0]
                     else:
                         errors.append(_('UoM not found in database.'))
@@ -1646,8 +1646,8 @@
                     write_vals.update({'imp_qty': 0.00, 'imp_price': 0.00, 'type_change': 'error'})
 
             # Currency
-            currency_value = values[7]
-            if tools.ustr(currency_value) == line.in_currency.name:
+            currency_value = values[7].lower()
+            if line.in_currency and tools.ustr(currency_value.lower()) == line.in_currency.name.lower():
                 write_vals['imp_currency'] = line.in_currency.id
             elif line.in_currency.name:
                 err_msg = _('The currency on the file is not the same as the currency of the PO line - You must have the same currency on both side - Currency of the initial line kept.')

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-07-12 16:14:38 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-07-21 13:40:33 +0000
@@ -8298,7 +8298,6 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:82
 #: code:addons/msf_doc_import/wizard/__init__.py:87
 #: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:193
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:213
 #: field:purchase.line.import.xml.line,product_qty:0
 #: field:internal.move.processor,quantity:0
 #: report:invoice:0
@@ -8375,6 +8374,11 @@
 msgid "Quantity"
 msgstr "Quantité"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:213
+msgid "quantity"
+msgstr "quantité"
+
 #. module: account_hq_entries
 #: field:account.account,is_not_ad_correctable:0
 #: field:hq.entries.split.lines,is_not_ad_correctable:0
@@ -24663,7 +24667,6 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:83
 #: code:addons/msf_doc_import/wizard/__init__.py:108
 #: code:addons/msf_doc_import/wizard/__init__.py:127
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:275
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:73
 #: field:initial.stock.inventory.line,inactive_error:0
 #: report:po.simulation.screen:0
@@ -24758,6 +24761,11 @@
 msgid "Comment"
 msgstr "Commentaire"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:275
+msgid "comment"
+msgstr "commentaire"
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
@@ -25766,12 +25774,17 @@
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:1065
 #: code:addons/msf_doc_import/wizard/__init__.py:57
 #: code:addons/msf_doc_import/wizard/__init__.py:62
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:249
 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:75
 #, python-format
 msgid "Requested Delivery Date"
 msgstr "Date de Livraison Demandée"
 
+#. modules: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:249
+#, python-format
+msgid "requested delivery date"
+msgstr "date de livraison demandée"
+
 #. modules: purchase, msf_order_date
 #: field:purchase.order.line,date_planned:0
 #: field:sale.order.line,date_planned:0
@@ -40368,7 +40381,6 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:100
 #: code:addons/msf_doc_import/wizard/__init__.py:104
 #: code:addons/msf_doc_import/wizard/__init__.py:122
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:222
 #: report:po.simulation.screen:0
 #: field:purchase.line.import.xml.line,product_uom:0
 #: field:wizard.import.in.line.simulation.screen,imp_uom_id:0
@@ -40485,6 +40497,12 @@
 msgid "UoM"
 msgstr "UdM"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:222
+#, python-format
+msgid "uom"
+msgstr "udm"
+
 #. module: msf_accrual
 #: model:ir.model,name:msf_accrual.model_wizard_accrual_validation
 msgid "wizard.accrual.validation"
@@ -43496,7 +43514,6 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:104
 #: code:addons/msf_doc_import/wizard/__init__.py:108
 #: code:addons/msf_doc_import/wizard/__init__.py:119
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:201
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:66
 #: field:wizard.simu.import.po.line,import_product_code:0
 #: field:wizard.simu.import.po.line,initial_product_code:0
@@ -43567,6 +43584,12 @@
 msgid "Product Code"
 msgstr "Code Produit"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:201
+#, python-format
+msgid "product code"
+msgstr "code produit"
+
 #. modules: account, analytic_distribution_supply, finance, register_accounting, account_override, msf_audittrail, analytic_distribution
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
@@ -51731,7 +51754,6 @@
 #: field:account.move.line,line_number:0
 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:239
 #: code:addons/msf_doc_import/wizard/__init__.py:57
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:194
 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:69
 #: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:129
 #: field:internal.request.import.line,imp_line_number:0
@@ -51744,6 +51766,12 @@
 msgid "Line Number"
 msgstr "Numéro de Ligne"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:194
+#, python-format
+msgid "line number"
+msgstr "numéro de ligne"
+
 #. module: product_nomenclature, product
 #: help:product.category,active:0
 #: help:product.nomenclature,active:0
@@ -57861,7 +57889,6 @@
 #: report:account.invoice2:0
 #: code:addons/msf_doc_import/wizard/__init__.py:57
 #: code:addons/msf_doc_import/wizard/__init__.py:88
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:240
 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:74
 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:74
 #: report:addons/msf_supply_doc_export/report/report_sale_order_xls.mako:74
@@ -57876,6 +57903,12 @@
 msgstr "Prix"
 
 #. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:240
+#, python-format
+msgid "price"
+msgstr "prix"
+
+#. module: msf_doc_import
 #: view:wizard.import.po:0
 #: view:wizard.import.po.line:0
 #: view:wizard.import.ad.line:0
@@ -66696,12 +66729,17 @@
 #: field:purchase.order,delivery_confirmed_date:0
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:1067
 #: code:addons/msf_doc_import/wizard/__init__.py:57
+#: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
+#: field:update.lines,delivery_confirmed_date:0
+#, python-format
+msgid "Confirmed Delivery Date"
+msgstr "Date de Livraison Confirmée"
+
+#. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:258
-#: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
-#: field:update.lines,delivery_confirmed_date:0
 #, python-format
-msgid "Confirmed Delivery Date"
-msgstr "Date de Livraison Confirmée"
+msgid "confirmed delivery date"
+msgstr "date de livraison confirmée"
 
 #. modules: purchase, msf_order_date, purchase_override
 #: field:purchase.order.line,confirmed_delivery_date:0
@@ -93148,7 +93186,6 @@
 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:245
 #: code:addons/msf_doc_import/wizard/__init__.py:58
 #: code:addons/msf_doc_import/wizard/__init__.py:83
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:267
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:45
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:71
 #: field:msf.doc.import.accounting.lines,currency_id:0
@@ -93267,6 +93304,12 @@
 msgid "Currency"
 msgstr "Devise"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:267
+#, python-format
+msgid "currency"
+msgstr "devise"
+
 #. module: base
 #: selection:res.config.users,context_tz:0
 #: selection:res.users,context_tz:0
@@ -110797,8 +110840,8 @@
 #. module: procurement_cycle
 #: code:addons/procurement_cycle/replenishment.py:3005
 #, python-format
-msgid "XLS Line %d: FROM DATE %d, date is not valid, found %s"
-msgstr "Ligne XLS %d: DATE DE %d invalide, trouvé %s"
+msgid "XLS Line %d: \"FROM DATE\" date is not valid, found %s"
+msgstr "Ligne XLS %d: date \"DATE DE\" invalide, trouvé %s"
 
 #. module: procurement_cycle
 #: code:addons/procurement_cycle/replenishment.py:3023
@@ -110815,8 +110858,8 @@
 #. module: procurement_cycle
 #: code:addons/procurement_cycle/replenishment.py:3010
 #, python-format
-msgid "XLS Line %d: TO DATE %d, date is not valid, found %s"
-msgstr "Ligne XLS %d: DATE À %d invalide, trouvé %s"
+msgid "XLS Line %d: \"TO DATE\" date is not valid, found %s"
+msgstr "Ligne XLS %d: date \"DATE À\" invalide, trouvé %s"
 
 #. module: procurement_cycle
 #: code:addons/procurement_cycle/replenishment.py:2999

=== modified file 'bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py'
--- bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2021-01-14 09:02:32 +0000
+++ bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2022-07-21 13:40:33 +0000
@@ -236,7 +236,7 @@
 
         prod_obj = self.pool.get('product.product')
 
-        product_ids = prod_obj.search(cr, uid, [('default_code', '=', line_data['code'])], limit=1, context=context)
+        product_ids = prod_obj.search(cr, uid, [('default_code', '=ilike', line_data['code'])], limit=1, context=context)
         if not product_ids:
             raise osv.except_osv(
                 _('Error'),

=== modified file 'bin/addons/procurement_cycle/replenishment.py'
--- bin/addons/procurement_cycle/replenishment.py	2022-05-20 10:03:35 +0000
+++ bin/addons/procurement_cycle/replenishment.py	2022-07-21 13:40:33 +0000
@@ -3605,7 +3605,7 @@
             prod_code = row.cells[0].data
             if not prod_code:
                 continue
-            prod_code = prod_code.strip()
+            prod_code = prod_code.strip().upper()
 
             seg_ref = row.cells[3].data
             if not seg_ref:
@@ -4215,7 +4215,6 @@
             else:
                 data_towrite['product_id'] = prod_id[0]
 
-
             if cells_nb < 5:
                 line_error.append(_('XLS Line %d: dates from and to required') % (idx,))
                 error += line_error
@@ -4223,12 +4222,12 @@
                 continue
 
             if not row.cells[3].type == 'datetime':
-                line_error.append(_('XLS Line %d: FROM DATE %d, date is not valid, found %s') % (idx, row.cells[3].data))
+                line_error.append(_('XLS Line %d: "FROM DATE" date is not valid, found %s') % (idx, row.cells[3].data))
                 error += line_error
                 continue
 
             if not row.cells[4].type == 'datetime':
-                line_error.append(_('XLS Line %d: TO DATE %d, date is not valid, found %s') % (idx, row.cells[4].data))
+                line_error.append(_('XLS Line %d: "TO DATE" date is not valid, found %s') % (idx, row.cells[4].data))
                 error += line_error
                 continue
 
@@ -4239,11 +4238,11 @@
             if error_date.get('warning', {}).get('message'):
                 line_error.append(_('XLS Line %d: %s') % (idx, error_date['warning']['message']))
 
-
-            if cells_nb > 6 and row.cells[6].data and not isinstance(row.cells[6].data, (int, long, float)):
-                line_error.append(_('XLS Line %d: Missing Qty must be a number, found %s') % (idx, row.cells[6].data))
-            else:
-                data_towrite['qty_missed'] = row.cells[6].data
+            if cells_nb > 6:
+                if row.cells[6].data and not isinstance(row.cells[6].data, (int, long, float)):
+                    line_error.append(_('XLS Line %d: Missing Qty must be a number, found %s') % (idx, row.cells[6].data))
+                else:
+                    data_towrite['qty_missed'] = row.cells[6].data
 
             replace_prod_col = 7
             for sub in [1, 2, 3]:

=== modified file 'bin/addons/sale/wizard/internal_request_import.py'
--- bin/addons/sale/wizard/internal_request_import.py	2022-03-21 10:18:41 +0000
+++ bin/addons/sale/wizard/internal_request_import.py	2022-07-21 13:40:33 +0000
@@ -612,7 +612,7 @@
                     comment = vals[7]
                     if product_code:
                         product_code = tools.ustr(product_code)
-                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=', product_code)], limit=1, context=context)
+                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=ilike', product_code)], limit=1, context=context)
                         if prod_ids:
                             product_id = prod_ids[0]
                             prod_cols = ['standard_price', 'uom_id', 'uom_po_id']
@@ -665,7 +665,7 @@
                         line_errors += _('Quantity must be a number. ')
 
                     # Cost Price and UoM
-                    uom_ids = uom_obj.search(cr, uid, [('name', '=', vals[5])], limit=1, context=context)
+                    uom_ids = uom_obj.search(cr, uid, [('name', '=ilike', vals[5])], limit=1, context=context)
                     if product_id and product:
                         cost_price = vals[4]
                         try:

=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2022-05-19 09:23:30 +0000
+++ bin/addons/stock/physical_inventory.py	2022-07-21 13:40:33 +0000
@@ -687,7 +687,7 @@
         cs_to_reset = []
         uom_ids = product_uom_obj.search(cr, uid, [], context=context)
         for uom in product_uom_obj.read(cr, uid, uom_ids, ['name'], context=context):
-            all_uom[uom['name']] = uom['id']
+            all_uom[uom['name'].lower()] = uom['id']
 
         for row_index, row in enumerate(counting_sheet_file.getRows()):
             # === Process header ===
@@ -742,7 +742,7 @@
 
             # Check product_code and type
             product_code = row.cells[1].data
-            product_ids = product_obj.search(cr, uid, [('default_code', '=like', product_code)], context=context)
+            product_ids = product_obj.search(cr, uid, [('default_code', '=ilike', product_code)], context=context)
             product_id = False
             if len(product_ids) == 1:
                 product_id = product_ids[0]
@@ -754,7 +754,7 @@
 
             # Check UoM
             product_uom_id = False
-            product_uom = row.cells[3].data
+            product_uom = row.cells[3].data.lower()
             if product_uom not in all_uom:
                 add_error(_("""UoM %s unknown""") % product_uom, row_index, 3)
             else:
@@ -922,7 +922,7 @@
             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)
+            product_id = product_obj.search(cr, uid, [('default_code', '=ilike', 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)),