Merge lp:~openerp-dev/openobject-addons/trunk-bug-954189-ssu into lp:openobject-addons

Proposed by Saurang Suthar(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-954189-ssu
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
purchase/purchase.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-954189-ssu
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+136887@code.launchpad.net

Description of the change

Hello,

I have fixed the issue of Selected UOM does not belong to the same category as the product UOM If once the UOM set on Purchase Order line, it raised warning message.

Kindly review it.

Thank you.
Saurang Suthar

To post a comment you must log in.
8159. By Saurang Suthar(OpenERP)

[MERGE]merged with main addons

Unmerged revisions

8159. By Saurang Suthar(OpenERP)

[MERGE]merged with main addons

8158. By Carlos Contreras (carlos-realsystems)

[FIX]purchase:fixed the issue Selected UOM does not belong to the same category as the product UOM If once the UOM set on Purchase Order line

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-11-27 21:59:08 +0000
3+++ purchase/purchase.py 2012-11-29 10:41:23 +0000
4@@ -965,7 +965,7 @@
5
6 # - check that uom and product uom belong to the same category
7 product_uom_po_id = product.uom_po_id.id
8- if not uom_id:
9+ if not uom_id or uom_id != product_uom_po_id:
10 uom_id = product_uom_po_id
11
12 if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id:

Subscribers

People subscribed via source and target branches

to all changes: