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

[Fix]: Bug #692698 purchase analysis - division by zero 

bzr revid: rha@tinyerp.com-20101223093700-53cspuk8klp27h8q
This commit is contained in:
rha@tinyerp.com 2010-12-23 15:07:00 +05:30
parent a3d9c98c47
commit 0a97c08aed
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/purchase/report/purchase_report.py
View File

@ -99,12 +99,9 @@ class purchase_report(osv.osv):
extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
count(*) as nbr,
(l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
avg(case when t.standard_price <= 0 then (l.price_unit*l.product_qty*u.factor)
else
(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))
end) as negociation,
avg(100.0 * (l.price_unit*l.product_qty*u.factor)/(nullif(t.standard_price*l.product_qty*u.factor,0)))::decimal(16,2) as negociation,
sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
(sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
(sum(l.product_qty*l.price_unit)/sum(nullif(l.product_qty*u.factor,0)))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
left join product_product p on (l.product_id=p.id)

3
addons/sale/report/sale_report.py
View File

@ -94,7 +94,8 @@ class sale_report(osv.osv):
u.name as uom_name,
sum(l.product_uom_qty * u.factor) as product_uom_qty,
sum(l.product_uom_qty*l.price_unit) as price_total,
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average,
(sum(l.product_uom_qty*l.price_unit)/sum(nullif(l.product_uom_qty * u.factor,0))*count(l.product_id))::decimal(16,2) as price_average,
pt.categ_id, l.order_id
from
sale_order_line l