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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/check_line.py'
--- bin/addons/msf_doc_import/check_line.py	2018-12-11 11:31:10 +0000
+++ bin/addons/msf_doc_import/check_line.py	2019-05-09 10:21:20 +0000
@@ -448,22 +448,29 @@
     # with warning_list: the line does not appear in red, it is just informative
     warning_list = kwargs['to_write']['warning_list']
     price = kwargs['price'] or 'Price'
+    is_rfq = kwargs['is_rfq']
     price_unit_defined = False
     cell_nb = kwargs.get('cell_nb', 3)
     try:
-        if not row.cells[cell_nb] or not row.cells[cell_nb].data:
-            if default_code:
-                warning_list.append(_('The Price Unit was not set, we have taken the default "%s" of the product.') % price)
+        if is_rfq:
+            if row.cells[cell_nb].type in ['int', 'float']:
+                price_unit_defined = True
+                price_unit = row.cells[cell_nb].data
+                cost_price = row.cells[cell_nb].data
+        else:
+            if not row.cells[cell_nb] or not row.cells[cell_nb].data:
+                if default_code:
+                    warning_list.append(_('The Price Unit was not set, we have taken the default "%s" of the product.') % price)
+                else:
+                    error_list.append(_('The Price and Product were not found.'))
+            elif row.cells[cell_nb].type not in ['int', 'float'] and not default_code:
+                error_list.append(_('The Price Unit was not a number and no product was found.'))
+            elif row.cells[cell_nb].type in ['int', 'float']:
+                price_unit_defined = True
+                price_unit = row.cells[cell_nb].data
+                cost_price = row.cells[cell_nb].data
             else:
-                error_list.append(_('The Price and Product were not found.'))
-        elif row.cells[cell_nb].type not in ['int', 'float'] and not default_code:
-            error_list.append(_('The Price Unit was not a number and no product was found.'))
-        elif row.cells[cell_nb].type in ['int', 'float']:
-            price_unit_defined = True
-            price_unit = row.cells[cell_nb].data
-            cost_price = row.cells[cell_nb].data
-        else:
-            error_list.append(_('The Price Unit was not defined properly.'))
+                error_list.append(_('The Price Unit was not defined properly.'))
     # if nothing is found at the line index (empty cell)
     except IndexError:
         if default_code:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2017-12-08 16:17:02 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2019-05-09 10:21:20 +0000
@@ -101,7 +101,7 @@
             error_log, message = '', ''
             header_index = context['header_index']
             template_col_count = len(header_index)
-            is_rfq = wiz.po_id.rfq_ok and wiz.po_id.state == 'rfq_sent'
+            is_rfq = wiz.po_id.rfq_ok
             mandatory_col_count = 9 if is_rfq else 7
 
             file_obj = SpreadsheetXML(xmlstring=base64.decodestring(wiz.file))
@@ -237,7 +237,8 @@
 
                         # Cell 4: Price
                         price_value = check_line.compute_price_value(
-                            row=row, to_write=to_write, cell_nb=header_index[_('Price')], price='Cost Price', context=context)
+                            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'],
                             error_list=price_value['error_list'],
@@ -449,7 +450,7 @@
                     cr, uid, ids, first_row, error_list=[], line_num=0, 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'] and rfq['state'] == 'rfq_sent'
+                is_rfq = rfq['rfq_ok']
                 res, res1 = wiz_common_import.check_header_values(
                     cr, uid, ids, context, header_index, is_rfq and columns_for_po_line_import + [_('Delivery confirmed date')] \
                     or columns_for_po_line_import[1:], origin='PO')