diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2013-03-20 11:13:16 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2013-03-20 11:13:16 +0100 |
| commit | bf84b78fed6fbc9b4a42e020cffb90eb8166ea1a (patch) | |
| tree | f73362fc5de2f2348bdf5d2305236db7ae424495 /addons | |
| parent | 2c497fab5050d8005bc181c14aaeb47b33553204 (diff) | |
[FIX]sale_report: fix problem when viewing reporting/sale_analysis and no order_lines where defined in a SO
lp bug: https://launchpad.net/bugs/938866 fixed
bzr revid: csn@openerp.com-20130320101316-vvv1mwkdio2pi6oi
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/sale/report/sale_report.py | 11 | ||||
| -rw-r--r-- | addons/sale_stock/report/sale_report.py | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index a20ba01f300..1a42f5d7b2e 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -88,12 +88,11 @@ class sale_report(osv.osv): s.project_id as analytic_account_id from sale_order s - left join sale_order_line l on (s.id=l.order_id) - left join product_product p on (l.product_id=p.id) - left join product_template t on (p.product_tmpl_id=t.id) - left join product_uom u on (u.id=l.product_uom) - left join product_uom u2 on (u2.id=t.uom_id) - where l.product_id is not null + join sale_order_line l on (s.id=l.order_id) + join product_product p on (l.product_id=p.id) + join product_template t on (p.product_tmpl_id=t.id) + join product_uom u on (u.id=l.product_uom) + join product_uom u2 on (u2.id=t.uom_id) group by l.product_id, l.product_uom_qty, diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py index ade84b269e6..9dcf37b59fc 100644 --- a/addons/sale_stock/report/sale_report.py +++ b/addons/sale_stock/report/sale_report.py @@ -68,11 +68,11 @@ class sale_report(osv.osv): s.project_id as analytic_account_id from sale_order s - left join sale_order_line l on (s.id=l.order_id) - left join product_product p on (l.product_id=p.id) - left join product_template t on (p.product_tmpl_id=t.id) - left join product_uom u on (u.id=l.product_uom) - left join product_uom u2 on (u2.id=t.uom_id) + join sale_order_line l on (s.id=l.order_id) + join product_product p on (l.product_id=p.id) + join product_template t on (p.product_tmpl_id=t.id) + join product_uom u on (u.id=l.product_uom) + join product_uom u2 on (u2.id=t.uom_id) group by l.product_id, l.product_uom_qty, |