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 50a99673e73..9ee55f9c9f5 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -26,7 +26,6 @@ - diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 497fe8da117..95ebf0f2623 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -32,6 +32,7 @@ class timesheet_report(osv.osv): ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), + 'date': fields.date('Date', readonly=True), 'name': fields.char('Description', size=64,readonly=True), 'product_id' : fields.many2one('product.product', 'Product'), 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True), @@ -62,6 +63,10 @@ class timesheet_report(osv.osv): select min(aal.id) as id, htss.name, + aal.date as date, + to_char(aal.date, 'YYYY-MM-DD') as day, + to_char(aal.date,'YYYY') as year, + to_char(aal.date,'MM') as month, htss.date_from, htss.date_to, count(*) as nbr, @@ -92,6 +97,7 @@ class timesheet_report(osv.osv): left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) group by aal.account_id, + aal.date, htss.date_from, htss.date_to, aal.unit_amount, diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 711bbaf2a35..aee07fc23b6 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -17,6 +17,7 @@ timesheet.report +