From 6641c61ce6b12fcf77797f94a8b44c506b445940 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Sat, 31 Jan 2015 19:10:22 +0100 Subject: [PATCH] [FIX]report:wrong uom for "product_qty in invoices analysis opw:626411 --- addons/account/report/account_invoice_report.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 0639bfca203..3930b164f40 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -147,8 +147,8 @@ class account_invoice_report(osv.osv): ai.partner_bank_id, SUM(CASE WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text]) - THEN (- ail.quantity) / u.factor - ELSE ail.quantity / u.factor + THEN (- ail.quantity) / u.factor * u2.factor + ELSE ail.quantity / u.factor * u2.factor END) AS product_qty, SUM(CASE WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text]) @@ -196,6 +196,7 @@ class account_invoice_report(osv.osv): LEFT JOIN product_product pr ON pr.id = ail.product_id left JOIN product_template pt ON pt.id = pr.product_tmpl_id LEFT JOIN product_uom u ON u.id = ail.uos_id + LEFT JOIN product_uom u2 ON u.id = pt.uom_id """ return from_str