odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Purchase : PO with different pricelists should not be merged 

lp bug: https://launchpad.net/bugs/440711 fixed

bzr revid: jvo@tinyerp.com-20091003133716-zkd40gb4x8hlbtfb
This commit is contained in:
Albert Cervera i Areny 2009-10-03 19:07:16 +05:30 committed by Jay (Open ERP)
parent ecad1e7e6c
commit 1f4ef0a39d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/purchase/wizard/wizard_group.py
View File

@ -37,6 +37,7 @@ merge_form = """<?xml version="1.0"?>
* their status is draft
* they belong to the same partner
* are going to the same location
* have the same pricelist
- lines will only be merged if:
* they are exactly the same except for the quantity and unit</label>
</form>
@ -76,7 +77,7 @@ def _merge_orders(self, cr, uid, data, context):
# compute what the new orders should contain
new_orders = {}
for porder in [order for order in order_obj.browse(cr, uid, data['ids']) if order.state == 'draft']:
order_key = make_key(porder, ('partner_id', 'location_id'))
order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
new_order = new_orders.setdefault(order_key, ({}, []))
new_order[1].append(porder.id)