From 519c621acb06d5290e99dcfe0b09644d40b4bea5 Mon Sep 17 00:00:00 2001
From: Amit Patel <apa@tinyerp.com>
Date: Wed, 17 Oct 2012 15:45:34 +0530
Subject: [PATCH] [FIX]:hr_timesheet:ProgrammingError: column
 timesheet_report.day does not exist:LINE 1: ...d) AS id,
 count(timesheet_report.id) AS day_count,"timesheet...

bzr revid: apa@tinyerp.com-20121017101534-pixtr1ayjw3xgk3k
---
 .../hr_timesheet_sheet/report/hr_timesheet_report_view.xml  | 1 -
 addons/hr_timesheet_sheet/report/timesheet_report.py        | 6 ++++++
 addons/hr_timesheet_sheet/report/timesheet_report_view.xml  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

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 @@
                     <field name="product_id" invisible="1"/>
                     <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
-
                     <field name="quantity" sum="Hours"/>
                     <field name="cost" sum="Total Cost"/>
                 </tree>
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 @@
             <field name="model">timesheet.report</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
+                    <field name="date" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>