diff options
| author | Yannick Tivisse <yti@odoo.com> | 2015-01-16 16:19:45 +0100 |
|---|---|---|
| committer | Richard Mathot <rim@odoo.com> | 2015-02-03 15:51:42 +0100 |
| commit | fd1ffe58f195d2e1679be056fca9687c4cabae6c (patch) | |
| tree | a09774e0c2294d184480ff3ba74d6e6d9bf2753a | |
| parent | 20176866778e9b688d4a9ac7248062fa4073914d (diff) | |
[FIX] purchase: Purchase Analysis view had traceback when grouping by Analytic Account
| -rw-r--r-- | addons/purchase/report/purchase_report.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 27daac78a38..d5c550400db 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -98,7 +98,8 @@ class purchase_report(osv.osv): sum(ip.value_float*l.product_qty/u.factor*u2.factor)::decimal(16,2) as price_standard, (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty/u.factor*u2.factor),0.0))::decimal(16,2) as price_average, partner.country_id as country_id, - partner.commercial_partner_id as commercial_partner_id + partner.commercial_partner_id as commercial_partner_id, + analytic_account.id as account_analytic_id from purchase_order_line l join purchase_order s on (l.order_id=s.id) join res_partner partner on s.partner_id = partner.id @@ -107,6 +108,7 @@ class purchase_report(osv.osv): LEFT JOIN ir_property ip ON (ip.name='standard_price' AND ip.res_id=CONCAT('product.template,',t.id) AND ip.company_id=s.company_id) left join product_uom u on (u.id=l.product_uom) left join product_uom u2 on (u2.id=t.uom_id) + left join account_analytic_account analytic_account on (l.account_analytic_id = analytic_account.id) group by s.company_id, s.create_uid, @@ -134,6 +136,7 @@ class purchase_report(osv.osv): u.id, u2.factor, partner.country_id, - partner.commercial_partner_id + partner.commercial_partner_id, + analytic_account.id ) """) |