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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/msf_doc_import/check_line.py'
--- bin/addons/msf_doc_import/check_line.py	2016-04-19 09:48:16 +0000
+++ bin/addons/msf_doc_import/check_line.py	2016-10-26 10:53:26 +0000
@@ -286,7 +286,9 @@
     except IndexError:
         comment += _(' Product Code to be defined')
         error_list.append(_('The Product\'s Code has to be defined'))
-    return {'default_code': default_code, 'proc_type': proc_type, 'comment': comment, 'error_list': error_list, 'price_unit': price_unit, 'cost_price': cost_price}
+    return {
+        'default_code': default_code, 'proc_type': proc_type, 'comment': comment, 'error_list': error_list, 'price_unit': price_unit,
+        'cost_price': cost_price, 'product_code':product_code}
 
 
 def quantity_value(**kwargs):
@@ -611,6 +613,28 @@
         warning_list.append(_("No comment was defined"))
     return {'comment': comment, 'warning_list': warning_list}
 
+
+def line_number_value(**kwargs):
+    '''
+    Retrives line number from Excel file
+    '''
+    row = kwargs["row"]
+    cell_nb  = kwargs['cell_nb']
+    line_number = kwargs['to_write']['line_number']
+    error_list = kwargs['to_write']['error_list']
+    try:
+        if not row.cells[cell_nb]:
+            error_list.append(_("No line number was defined"))
+        elif row.cells[cell_nb].type != 'int':
+            error_list.append(_("The line number must be an integer"))
+        else:
+            line_number = row.cells[cell_nb].data
+    except IndexError:
+        error_list.append(_("No line number was defined"))
+    return {'line_number': line_number, 'error_list':error_list}
+
+
+
 def check_lines_currency(rows, ccy_col_index, ccy_expected_code):
     """
     check rows currency
 
=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2016-10-26 10:53:26 +0000
@@ -268,6 +268,13 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         context.update({'active_id': ids[0]})
+
+        # Check if we are in the case of update of sent RfQ
+        po = self.browse(cr, uid, [ids[0]], context=context)[0]
+        columns = columns_for_po_line_import
+        if not po.rfq_ok or po.state != 'rfq_sent':
+            columns = columns_for_po_line_import[1:]
+
         columns_header = [(_(f[0]), f[1]) for f in columns_header_for_po_line_import]
         default_template = SpreadsheetCreator('Template of import', columns_header, [])
         file = base64.encodestring(default_template.get_xml(default_filters=['decode.utf8']))
@@ -275,7 +282,7 @@
                                                                             'filename_template': 'template.xls',
                                                                             'filename': 'Lines_Not_Imported.xls',
                                                                             'po_id': ids[0],
-                                                                            'message': """%s %s""" % (_(GENERIC_MESSAGE), ', '.join([_(f) for f in columns_for_po_line_import]),),
+                                                                            'message': """%s %s""" % (_(GENERIC_MESSAGE), ', '.join([_(f) for f in columns]),),
                                                                             'state': 'draft', },
                                                                    context)
         return {'type': 'ir.actions.act_window',
 
=== modified file 'bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml'
--- bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-05-26 08:58:45 +0000
+++ bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-10-26 10:53:26 +0000
@@ -25,7 +25,7 @@
                     <field name="soq_updated" invisible="1" readonly="1" />
                 </xpath>
                 <xpath expr="/form/notebook/page/field[@name='order_line']/tree" position="attributes" >
-                    <attribute name="colors">red:to_correct_ok == True or inactive_product == True; #C8C8C8: fake_state == 'cancel'; orange:product_qty == 0.00;blue: soq_updated == True</attribute>
+                    <attribute name="colors">red:to_correct_ok == True or inactive_product == True or red_color == True; #C8C8C8: fake_state == 'cancel'; orange:product_qty == 0.00;blue: soq_updated == True</attribute>
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Notes']/field[@name='notes']" position="before">
                     <field name="import_in_progress" readonly="1" invisible="0" />
@@ -42,6 +42,9 @@
                     </field>
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']" position="before" >
+                    <button name="wizard_import_po_line" string="Import RfQ lines" icon="gtk-dnd" type="object" attrs="{'invisible':[('state', '!=', 'rfq_sent')]}"/>
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']" position="before" >
                   <group name="import" string=" Import Lines " colspan="1" col="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
                     <button name="wizard_import_po_line" string="Import lines" icon="gtk-dnd" col="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
                     <button name="button_remove_lines" string="Delete Lines" icon="gtk-remove" colspan="1" type="object" attrs="{'invisible': ['|', ('po_from_fo', '=', True), ('po_from_ir', '=', True)]}" />
 
=== modified file 'bin/addons/msf_doc_import/wizard/__init__.py'
--- bin/addons/msf_doc_import/wizard/__init__.py	2016-09-12 08:55:55 +0000
+++ bin/addons/msf_doc_import/wizard/__init__.py	2016-10-26 10:53:26 +0000
@@ -54,8 +54,8 @@
 #Important NOTE: I didn't set the fields of type date with the attribute 'date' (2nd part of the tuple) because for Excel, when a date is empty, the field becomes '1899-30-12' as default. So I set 'string' instead for the fields date.
 
 PO_COLUMNS_HEADER_FOR_IMPORT=[
-(_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
-(_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string')]
+(_('Line Number'), 'number'), (_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
+(_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string'),]
 PO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in PO_COLUMNS_HEADER_FOR_IMPORT]
 
 FO_COLUMNS_HEADER_FOR_IMPORT=[
 
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2016-08-26 10:10:58 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2016-10-26 10:53:26 +0000
@@ -96,30 +96,38 @@
                 or not wiz.po_id.pricelist_id.currency_id:
                 raise osv.except_osv(_("Error!"), _("Order currency not found!"))
 
-            ignore_lines, complete_lines, lines_to_correct = 0, 0, 0
+            ignore_lines, complete_lines, lines_to_correct, created_lines = 0, 0, 0, 0
             line_ignored_num, error_list = [], []
             error_log, message = '', ''
             header_index = context['header_index']
             template_col_count = len(header_index)
-            mandatory_col_count = 7
+            is_rfq = wiz.po_id.rfq_ok and wiz.po_id.state == 'rfq_sent'
+            mandatory_col_count = 8 if is_rfq else 7
 
             file_obj = SpreadsheetXML(xmlstring=base64.decodestring(wiz.file))
 
             """
             1st path: check currency in lines in phasis with document
             REF-94: BECAREFUL WHEN CHANGING THE ORDER OF CELLS IN THE IMPORT FILE!!!!!
-            CCY COL INDEX: 6
+            CCY COL INDEX: 6 (PO) or 7 (RfQ)
             """
             order_currency_code = wiz.po_id.pricelist_id.currency_id.name
-            currency_index = 6
+            currency_index = 7 if is_rfq else 6
             row_iterator = file_obj.getRows()
 
             # don't use the original
             row_iterator, row_iterator_line_check = itertools.tee(row_iterator)
 
             row_iterator_line_check.next()  # skip header line
-            lines_to_correct = check_line.check_lines_currency(row_iterator_line_check,
-                currency_index, order_currency_code)
+            try:
+                lines_to_correct = check_line.check_lines_currency(row_iterator_line_check, currency_index, order_currency_code)
+            except Exception as e:
+                message = _("""An error occurs during the check of the currency: %s""") % e
+                categ_log = ''
+                line_num = 0
+                error_list.append(message)
+                logging.getLogger('import purchase order').error('Error %s' % e)
+
             if lines_to_correct > 0:
                 categ_log = ''
                 line_num = 0
@@ -129,6 +137,7 @@
                 error_list.append(msg)
 
             if not error_list:
+                line_number_set = set()
                 to_write = {}
                 total_line_num = file_obj.getNbRows()
                 # ignore the header line
@@ -153,13 +162,14 @@
                         'proc_type': 'make_to_order',
                         'default_code': False,
                         'confirmed_delivery_date': False,
+                        'line_number':'',
                     }
 
                     col_count = len(row)
                     if col_count != template_col_count and col_count != mandatory_col_count:
                         message += _("Line %s: You should have exactly %s columns in this order: %s \n") % (
                                 line_num, template_col_count,
-                                ','.join(columns_for_po_line_import))
+                                ','.join(is_rfq and columns_for_po_line_import or columns_for_po_line_import[1:]))
                         line_with_error.append(
                             wiz_common_import.get_line_values(
                                 cr, uid, ids, row, cell_nb=False,
@@ -176,7 +186,16 @@
                             total_line_num -= 1
                             continue
 
-                        # Cell 0: Product Code
+
+                        # 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)
+                            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')],
                             product_obj=product_obj, row=row, to_write=to_write, context=context)
@@ -211,7 +230,7 @@
                                 to_write.update(product_qty=round_qty['value']['product_qty'])
                                 warn_list = to_write['warning_list']
                                 warn_list.append(round_qty['warning']['message'])
-                                #message += _("Line %s in the Excel file: %s\n") % (line_num, round_qty['warning']['message'])
+                            #message += _("Line %s in the Excel file: %s\n") % (line_num, round_qty['warning']['message'])
 
                         # Cell 4: Price
                         price_value = check_line.compute_price_value(
@@ -245,11 +264,14 @@
                         to_write.update(
                             comment=c_value['comment'],
                             warning_list=c_value['warning_list'])
+
+
                         to_write.update(
                             to_correct_ok=any(to_write['error_list']),  # the lines with to_correct_ok=True will be red
                             show_msg_ok=any(to_write['warning_list']),  # the lines with show_msg_ok=True won't change color, it is just info
                             order_id=wiz.po_id.id,
                             text_error='\n'.join(to_write['error_list'] + to_write['warning_list']))
+
                         # we check consistency on the model of on_change functions to call for updating values
                         purchase_line_obj.check_line_consistency(
                             cr, uid, wiz.po_id.id, to_write=to_write, context=context)
@@ -264,9 +286,50 @@
                             cr.rollback()
                             continue
 
-                        # write order line on PO
-                        purchase_line_obj.create(cr, uid, to_write, context=context)
-                        vals['order_line'].append((0, 0, to_write))
+
+                        if is_rfq:
+                            rfq_line_ids = purchase_line_obj.search(cr, uid, [('order_id', '=', wiz.po_id.id), ('line_number', '=', to_write['line_number'])])
+                            to_write['rfq_ok'] = True
+
+                            # CASE 1: the line is not registered in the system, so CREATE it :
+                            if not rfq_line_ids:
+                                created_lines += 1
+                                if wiz.po_id.tender_id:
+                                    msg =  _('Warning! You are adding new lines which did not exist in the original tender!')
+                                    if msg not in message:
+                                        message += msg
+                                to_write.update({
+                                    'line_number': False,
+                                    'red_color': True,
+                                })
+                                purchase_line_obj.create(cr, uid, to_write, context=context)
+
+                            # CASE 2: the line is already in the system, so UPDATE it :
+                            for po_line in purchase_line_obj.browse(cr, uid, rfq_line_ids, context=context):
+                                # some checks :
+                                if to_write['line_number'] in line_number_set: 
+                                    raise osv.except_osv(_('Error'), _("the same line number appears several times"))
+                                else:
+                                    line_number_set.add(to_write['line_number'])
+                                if p_value['product_code'] != po_line.product_id.default_code:
+                                    raise osv.except_osv(_('Error'), _("Product code from system and from import must be the same."))
+                                if not price_value['price_unit_defined']:
+                                    raise osv.except_osv(_('Error'), _("Price must be defined in the RfQ import file."))
+
+                                # in case of update we do not want to update qty and uom values :
+                                if to_write.has_key('product_qty'):
+                                    to_write.pop('product_qty')
+                                if to_write.has_key('product_uom'):
+                                    to_write.pop('product_uom')
+
+                                # update POL :
+                                purchase_line_obj.write(cr, uid, rfq_line_ids, to_write, context=context)
+
+                        else: # its not RfQ
+                            purchase_line_obj.create(cr, uid, to_write, context=context)
+                        
+                        vals['order_line'].append((0, 0, to_write)) 
+
                         if to_write['error_list']:
                             lines_to_correct += 1
                         complete_lines += 1
@@ -327,13 +390,13 @@
             final_message = _('''
 %s
 Importation completed in %s!
-# of imported lines : %s on %s lines
+# of imported lines : %s on %s lines (%s updated and %s created)
 # of ignored lines: %s
 # of lines to correct: %s
 %s
 
 %s
-''') % (categ_log, total_time, complete_lines, line_num, ignore_lines, lines_to_correct, error_log, message)
+''') % (categ_log, total_time, complete_lines, line_num, complete_lines-created_lines,created_lines, ignore_lines, lines_to_correct, error_log, message)
             wizard_vals['message'] = final_message
             if line_with_error:
                 file_to_export = wiz_common_import.export_file_with_error(
@@ -371,8 +434,10 @@
                 header_index = wiz_common_import.get_header_index(
                     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'
                 res, res1 = wiz_common_import.check_header_values(
-                    cr, uid, ids, context, header_index, columns_for_po_line_import,
+                        cr, uid, ids, context, header_index, is_rfq and columns_for_po_line_import or columns_for_po_line_import[1:],
                     origin='PO')
                 if not res:
                     return self.write(cr, uid, ids, res1, context)
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-21 15:36:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-10-26 10:53:26 +0000
@@ -74611,6 +74611,7 @@
 "	Number of columns is not equal to %s"
 msgstr "\n"
 "	Le nombre de colonnes n'est pas égal à %s"
+<<<<<<< TREE
 
 #. module: specific_rules
 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
@@ -74683,3 +74684,11 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:300
+#, python-format
+msgid "Warning! You are adding new lines which did not exist in the original tender!"
+msgstr "Attention ! Vous avez ajouté une nouvelle ligne qui n'existe pas dans l'appel d'offre original !"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako	2014-04-29 14:10:16 +0000
+++ bin/addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako	2016-10-26 10:53:26 +0000
@@ -66,6 +66,7 @@
 <Column ss:AutoFitWidth="1" ss:Width="250" />
     
     <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Line Number')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
@@ -77,6 +78,7 @@
     </Row>
     % for line in o.order_line:
     <Row>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.line_number or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id.default_code or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id.name or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.product_qty or '')|x}</Data></Cell>
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-10-16 10:55:55 +0000
+++ bin/addons/purchase_override/purchase.py	2016-10-26 10:53:26 +0000
@@ -3708,6 +3708,7 @@
             string='SoQ updated',
             readonly=True,
         ),
+        'red_color': fields.boolean(string='Red color'),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/purchase_override/purchase_view.xml'
--- bin/addons/purchase_override/purchase_view.xml	2016-08-03 12:08:12 +0000
+++ bin/addons/purchase_override/purchase_view.xml	2016-10-26 10:53:26 +0000
@@ -146,6 +146,7 @@
                     </xpath>
 
                     <xpath expr="/form/notebook//tree//field[@name='price_subtotal']" position="after">
+                        <field name="red_color" invisible="1" />
                         <field name="rfq_ok" invisible="1" />
                         <field name="tender_line_id" invisible="1" />
                         <field name="fake_state" invisible="1" />