Merge lp:~unifield-team/unifield-addons/addons-1047 into lp:unifield-addons

[jftempo]

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-03-29 11:17:16 +0000
+++ purchase/purchase.py	2012-07-06 16:21:19 +0000
@@ -870,7 +870,7 @@
             seller_delay = hook['seller_delay']
             partner_id = partner.id
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
-            pricelist_id = partner.property_product_pricelist_purchase.id
+            pricelist_id = partner.property_product_pricelist_purchase
 
             uom_id = procurement.product_id.uom_po_id.id
 
@@ -878,7 +878,7 @@
             if seller_qty:
                 qty = max(qty,seller_qty)
 
-            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id]
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id.id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id.id]
             if hook.get('price_unit', False):
                 price = hook.get('price_unit', False)            
 
@@ -902,7 +902,7 @@
             }
             
             # line values modification from hook
-            line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement,)
+            line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement,pricelist=pricelist_id)
 
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
             taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
@@ -914,7 +914,7 @@
                       'partner_id': partner_id,
                       'partner_address_id': address_id,
                       'location_id': procurement.location_id.id,
-                      'pricelist_id': pricelist_id,
+                      'pricelist_id': pricelist_id.id,
                       'order_line': [(0,0,line)],
                       'company_id': procurement.company_id.id,
                       'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,