From 40a7a5dc64328c31b3ad3bbdb23284fcecb58d21 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 25 Nov 2013 15:26:24 +0100 Subject: [PATCH 1/2] [FIX]hr_timesheet_sheet: report, the join clause of the view was wrong, account_analytic_line is join with hr_timesheet_sheet_sheet thanks to the sheet_id (hat.sheet_id=htss.id), not with the line_id (hat.line_id=htss.id) bzr revid: dle@openerp.com-20131125142624-wilbjmlgy9yubcgk --- addons/hr_timesheet_sheet/report/timesheet_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 31255a3a6b2..0c535af4d11 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -95,7 +95,7 @@ class timesheet_report(osv.osv): htss.state from account_analytic_line as aal left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) - left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) + left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id) group by aal.account_id, aal.date, From fd080fb7458bcfc27bf43b6c1e36623bf5b60692 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 25 Nov 2013 17:03:15 +0100 Subject: [PATCH 2/2] [FIX]hr_timesheet_sheet: remove useless css rule, which had the effect of erasing the half timesheet weekly input on ie. bzr revid: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku --- addons/hr_timesheet_sheet/static/src/css/timesheet.css | 1 - addons/hr_timesheet_sheet/static/src/css/timesheet.sass | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css index 36ea9a34db9..887e8665a28 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css @@ -33,7 +33,6 @@ min-width: 130px; } .openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input { - padding: 5px 2px !important; width: 40px; text-align: right; min-width: 0 !important; diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass index 5e04271037c..bd90deab122 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass @@ -28,7 +28,6 @@ .oe_timesheet_first_col min-width: 130px td input.oe_timesheet_weekly_input - padding: 5px 2px !important width: 40px text-align: right min-width: 0 !important