Unifield Addons

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

  1. addons-1047
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4542
Proposed branch: lp:~unifield-team/unifield-addons/addons-1047
Merge into: lp:unifield-addons
Diff against target: 39 lines (+4/-4)
1 file modified
purchase/purchase.py (+4/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/addons-1047
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+113765@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase/purchase.py'
2--- purchase/purchase.py 2012-03-29 11:17:16 +0000
3+++ purchase/purchase.py 2012-07-06 16:21:19 +0000
4@@ -870,7 +870,7 @@
5 seller_delay = hook['seller_delay']
6 partner_id = partner.id
7 address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
8- pricelist_id = partner.property_product_pricelist_purchase.id
9+ pricelist_id = partner.property_product_pricelist_purchase
10
11 uom_id = procurement.product_id.uom_po_id.id
12
13@@ -878,7 +878,7 @@
14 if seller_qty:
15 qty = max(qty,seller_qty)
16
17- price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id]
18+ price = pricelist_obj.price_get(cr, uid, [pricelist_id.id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id.id]
19 if hook.get('price_unit', False):
20 price = hook.get('price_unit', False)
21
22@@ -902,7 +902,7 @@
23 }
24
25 # line values modification from hook
26- line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement,)
27+ line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement,pricelist=pricelist_id)
28
29 taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
30 taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
31@@ -914,7 +914,7 @@
32 'partner_id': partner_id,
33 'partner_address_id': address_id,
34 'location_id': procurement.location_id.id,
35- 'pricelist_id': pricelist_id,
36+ 'pricelist_id': pricelist_id.id,
37 'order_line': [(0,0,line)],
38 'company_id': procurement.company_id.id,
39 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,

Subscribers

People subscribed via source and target branches

to all changes: