From fb927c08bb3ec99c313eb34e9e21b3ac30e1e518 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 16 May 2013 15:24:12 +0200 Subject: [PATCH] [FIX] mrp: fixed the psql view in order to take into consideration properties defined for company_id = False as a fallback (if no property can be found for given company) bzr revid: qdp-launchpad@openerp.com-20130516132412-ynuegr1gj1m6jdaf --- addons/mrp/report/mrp_report.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py index 656b015e55b..9acdebe0f05 100644 --- a/addons/mrp/report/mrp_report.py +++ b/addons/mrp/report/mrp_report.py @@ -86,16 +86,18 @@ class report_mrp_inout(osv.osv): on (pp.id = sm.product_id) left join product_template pt on (pt.id = pp.product_tmpl_id) - LEFT JOIN ir_property ip - ON (ip.name='standard_price' AND ip.res_id=CONCAT('product.template,',pt.id) AND ip.company_id=sm.company_id) left join stock_location sl on ( sl.id = sm.location_id) left join stock_location sl2 - on ( sl2.id = sm.location_dest_id) + on ( sl2.id = sm.location_dest_id), + ir_property ip where sm.state in ('waiting','confirmed','assigned') + and + ip.name='standard_price' AND ip.res_id=CONCAT('product.template,',pt.id) AND (ip.company_id=sm.company_id OR ip.company_id IS NULL) group by - to_char(sm.date,'YYYY:IW') + to_char(sm.date,'YYYY:IW'), ip.company_id + order by ip.company_id ASC LIMIT 1 )""")