diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index 100041ca35a..84ef868ab81 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -28,6 +28,7 @@ class hr_timesheet_report(osv.osv): _auto = False _columns = { 'year': fields.char('Year',size=64,required=False, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), @@ -50,6 +51,7 @@ class hr_timesheet_report(osv.osv): select min(t.id) as id, l.date as date, + to_char(l.date, 'YYYY-MM-DD') as day, to_char(l.date,'YYYY') as year, to_char(l.date,'MM') as month, sum(l.amount) as cost, diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 72d0e177fea..9c0588f618e 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -21,7 +21,7 @@ - + @@ -41,16 +41,16 @@ - - @@ -76,7 +76,7 @@ - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index a786a123529..43bc0d2b9cc 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -49,18 +49,17 @@ - - + - + help="Timesheet in current month"/> + - - - + + +