Merge lp:~jfb-tempo-consulting/unifield-server/US-5395 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-11-26 17:05:18 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-11-30 09:36:42 +0000
@@ -77477,7 +77477,7 @@
 msgid "# of lines imported"
 msgstr "# de lignes importées"
 
-#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup
+#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup, procurement_request
 #: field:account.invoice.line,price_unit:0
 #: report:account.invoice2:0
 #: report:allocation.invoices.report:0
@@ -77522,6 +77522,11 @@
 #: report:addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako:75
 #: field:supplier.catalogue.line,unit_price:0
 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:577
+#: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:133
+#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:217
+#: code:addons/sale/wizard/internal_request_import.py:46
+#: field:internal.request.import.line,imp_cost_price:0
+#: field:internal.request.import.line,in_cost_price:0
 #, python-format
 msgid "Unit Price"
 msgstr "Prix Unitaire"
@@ -101500,16 +101505,6 @@
 msgid "UoM '%s' is not consistent with the Product '%s'. "
 msgstr "L'UdM '%s' n'est pas cohérente avec le Produit '%s'. "
 
-#. modules: msf_supply_doc_export, sale, procurement_request
-#: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:133
-#: code:addons/sale/wizard/internal_request_import.py:46
-#: field:internal.request.import.line,imp_cost_price:0
-#: field:internal.request.import.line,in_cost_price:0
-#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:217
-#, python-format
-msgid "Cost Price"
-msgstr "Prix Unitaire"
-
 #. module: sale
 #: code:addons/sale/wizard/internal_request_import.py:294
 #, python-format
@@ -101776,7 +101771,7 @@
 #. module: sale
 #: code:addons/sale/wizard/internal_request_import.py:487
 #, python-format
-msgid "Cost Price must be a number. "
+msgid "Unit Price must be a number. "
 msgstr "Le Prix Unitaire doit être un nombre. "
 
 #. module: sale
 
=== modified file 'bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako'
--- bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako	2018-11-05 14:54:54 +0000
+++ bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako	2018-11-30 09:36:42 +0000
@@ -130,7 +130,7 @@
         <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>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Price')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
@@ -142,7 +142,7 @@
         <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_uom_qty or '' | x}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="Number">${line.cost_price or (line.product_id and line.product_id.standard_price) or '' | x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${line.price_unit or (line.product_id and line.product_id.standard_price) or '' | x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${line.product_uom.name or ''| x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${line.functional_currency_id.name or ''| x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${line.comment or ''| x}</Data></Cell>
 
=== modified file 'bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako'
--- bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako	2018-11-07 16:34:07 +0000
+++ bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako	2018-11-30 09:36:42 +0000
@@ -218,7 +218,7 @@
         <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>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Price')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
 
=== modified file 'bin/addons/sale/wizard/internal_request_import.py'
--- bin/addons/sale/wizard/internal_request_import.py	2018-11-20 15:11:47 +0000
+++ bin/addons/sale/wizard/internal_request_import.py	2018-11-30 09:36:42 +0000
@@ -41,7 +41,7 @@
     (1, _('Product Code'), 'optionnal'),
     (2, _('Product Description'), 'optionnal'),
     (3, _('Quantity'), 'mandatory'),
-    (4, _('Cost Price'), 'optionnal'),
+    (4, _('Unit Price'), 'optionnal'),
     (5, _('UoM'), 'mandatory'),
     (6, _('Currency'), 'optionnal'),
     (7, _('Comment'), 'optionnal'),
@@ -660,6 +660,7 @@
                             if cost_price > 0:
                                 line_data.update({'imp_cost_price': cost_price})
                             else:
+                                line_data.update({'imp_cost_price': product['standard_price']})
                                 line_errors += _('Price \'%s\' must be above 0, default cost price has been used. ') \
                                     % (cost_price,)
                         except:
@@ -683,7 +684,7 @@
                                 line_errors += _('Price \'%s\' must be above 0. ') % (cost_price,)
                         except:
                             red = True
-                            line_errors += _('Cost Price must be a number. ')
+                            line_errors += _('Unit Price must be a number. ')
                         if uom_ids:
                             line_data.update({'imp_uom_id': uom_ids[0]})
                         else:
@@ -845,6 +846,8 @@
                                 'product_uom_qty': line.imp_qty or 0.00,
                                 'comment': line.imp_comment or '',
                                 'stock_take_date': line.imp_stock_take_date or False,
+                                'cost_price': line.imp_cost_price or 0.00,
+                                'price_unit': line.imp_cost_price or 0.00,
                             }
                             if line.imp_uom_id:
                                 line_vals.update({'product_uom': line.imp_uom_id.id})
@@ -853,8 +856,6 @@
                             else:  # create IR line
                                 line_vals.update({
                                     'order_id': wiz.order_id.id,
-                                    'cost_price': line.imp_cost_price or 0.00,
-                                    'price_unit': line.imp_cost_price or 0.00,
                                 })
                                 sol_obj.create(cr, uid, line_vals, context=context)
                 else:  # Create IR
@@ -945,7 +946,7 @@
         'in_product': fields.char(string='Product', size=64, readonly=True),
         'in_product_desc': fields.char(string='Product Description', size=128, readonly=True),
         'in_qty': fields.char(string='Quantity', size=64, readonly=True),
-        'in_cost_price': fields.char(string='Cost Price', size=64, readonly=True),
+        'in_cost_price': fields.char(string='Unit Price', size=64, readonly=True),
         'in_uom': fields.char(string='UoM', size=64, readonly=True),
         'in_comment': fields.char(string='Comment', size=256, readonly=True),
         'in_stock_take_date': fields.char(string='Date of Stock Take', size=64, readonly=True),
@@ -953,7 +954,7 @@
         'imp_line_number': fields.integer(string='Line Number'),
         'imp_product_id': fields.many2one('product.product', string='Product', readonly=True),
         'imp_qty': fields.float(digits=(16, 2), string='Quantity', readonly=True),
-        'imp_cost_price': fields.float(digits=(16, 2), string='Cost Price', readonly=True),
+        'imp_cost_price': fields.float(digits=(16, 2), string='Unit Price', readonly=True),
         'imp_uom_id': fields.many2one('product.uom', string='UoM', readonly=True),
         'imp_comment': fields.char(size=256, string='Comment', readonly=True),
         'imp_stock_take_date': fields.date(string='Date of Stock Take', readonly=True),