From 630f3d566f4d8bdec55f05345b8b79f4089490df Mon Sep 17 00:00:00 2001 From: oihane Date: Tue, 19 Apr 2016 15:36:50 +0200 Subject: [PATCH] [FIX] hr_timesheet_invoice: fully qualify grouped fields in SQL view Avoids name collisions when custom columns are involved. Closes #11743 --- addons/hr_timesheet_invoice/report/report_analytic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py index 02d164dd884..d6f66eeef48 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic.py +++ b/addons/hr_timesheet_invoice/report/report_analytic.py @@ -101,7 +101,7 @@ class report_account_analytic_line_to_invoice(osv.osv): WHERE (invoice_id IS NULL) and (to_invoice IS NOT NULL) GROUP BY - to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id + to_char(l.date, 'YYYY'), to_char(l.date,'MM'), l.product_id, l.product_uom_id, l.account_id ) """)