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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py	2017-04-19 13:19:37 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py	2017-12-14 10:58:21 +0000
@@ -178,7 +178,8 @@
                         # Cell 0: Product Code
                         p_value = check_line.product_value(cr, uid, obj_data=obj_data, product_obj=product_obj, row=row, to_write=to_write, context=context)
                         to_write.update({'default_code': p_value['default_code'], 'product_id': p_value['default_code'], 'cost_price': p_value['cost_price'],
-                                         'comment': p_value['comment'], 'error_list': p_value['error_list'], 'type': p_value['proc_type']})
+                                         'price_unit': p_value['price_unit'], 'comment': p_value['comment'], 'error_list': p_value['error_list'],
+                                         'type': p_value['proc_type']})
 
                         # Cell 2: Quantity
                         qty_value = check_line.quantity_value(cell_nb=2, product_obj=product_obj, row=row, to_write=to_write, context=context)
@@ -186,8 +187,8 @@
 
                         # Cell 3: Cost Price
                         price_value = check_line.compute_price_value(cell_nb=3, row=row, to_write=to_write, price='Cost Price', context=context)
-                        to_write.update({'cost_price': price_value['cost_price'], 'error_list': price_value['error_list'],
-                                         'warning_list': price_value['warning_list']})
+                        to_write.update({'cost_price': price_value['cost_price'], 'price_unit': price_value['price_unit'],
+                                         'error_list': price_value['error_list'], 'warning_list': price_value['warning_list']})
 
                         # Cell 4: UoM
                         uom_value = check_line.compute_uom_value(cr, uid, cell_nb=4, obj_data=obj_data, product_obj=product_obj, uom_obj=uom_obj, row=row, to_write=to_write, context=context)

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2017-12-13 14:39:53 +0000
+++ bin/addons/sourcing/sale_order_line.py	2017-12-14 10:58:21 +0000
@@ -1547,6 +1547,7 @@
             ids = [ids]
 
         wf_service = netsvc.LocalService("workflow")
+        pricelist_obj = self.pool.get('product.pricelist')
 
         for sourcing_line in self.browse(cr, uid, ids, context=context):
             if sourcing_line.type == 'make_to_stock':
@@ -1611,6 +1612,18 @@
                             )
 
                         anal_dist = self.pool.get('analytic.distribution').copy(cr, uid, distib_to_copy, {}, context=context)
+
+                    # set unit price
+                    if sourcing_line.product_id and sourcing_line.supplier.property_product_pricelist_purchase:
+                        price_dict = pricelist_obj.price_get(cr, uid, [sourcing_line.supplier.property_product_pricelist_purchase.id],
+                                                        sourcing_line.product_id.id, sourcing_line.product_uom_qty,
+                                                        sourcing_line.supplier.id, {'uom': sourcing_line.product_uom.id})
+                        if price_dict[sourcing_line.supplier.property_product_pricelist_purchase.id]:
+                            price = price_dict[sourcing_line.supplier.property_product_pricelist_purchase.id]
+                        else:
+                            price = 0.0
+                    else:
+                        price = 0.0
                     # attach PO line:
                     price_unit = sourcing_line.price_unit if sourcing_line.price_unit > 0 else (sourcing_line.product_id and sourcing_line.product_id.standard_price or 0.0)
                     src_currency = sourcing_line.currency_id.id
@@ -1622,7 +1635,11 @@
                         'product_id': sourcing_line.product_id.id or False,
                         'product_uom': sourcing_line.product_id and sourcing_line.product_id.uom_id.id or sourcing_line.product_uom.id,
                         'product_qty': sourcing_line.product_uom_qty,
+<<<<<<< TREE
                         'price_unit': price_unit,
+=======
+                        'price_unit': price if price > 0 else (sourcing_line.product_id and sourcing_line.product_id.standard_price or 0.0),
+>>>>>>> MERGE-SOURCE
                         'partner_id': sourcing_line.supplier.id,
                         'origin': sourcing_line.order_id.name,
                         'sale_order_line_id': sourcing_line.id,