[MERGE] Merged Tejas' branch for the fix of invoice analysis query (Ref : Cases 4963,5061)

bzr revid: jvo@tinyerp.com-20110407123434-83g73rhtcn84979z
This commit is contained in:
Jay Vora (OpenERP) 2011-04-07 18:04:34 +05:30
commit c60c6e8e02
1 changed files with 1 additions and 1 deletions

View File

@ -89,7 +89,7 @@ class account_invoice_report(osv.osv):
ai.payment_term as payment_term,
ai.period_id as period_id,
(case when u.uom_type not in ('reference') then
(select name from product_uom where uom_type='reference' and category_id=u.category_id)
(select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
else
u.name
end) as uom_name,