pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] when click time sheet timesheet sheet analysis in reporting

Browse Source 
bzr revid: shp@tinyerp.com-20121010090913-lugvm9jwb43hdmmq
This commit is contained in:
pankita shah (Open ERP)
2012-10-10 14:39:13 +05:30
parent 77636fcdbc
commit e65a9208b8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+2 -2
View File
@@ -54,8 +54,8 @@ class hr_timesheet_report(osv.osv):
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,
to_char(l.date, 'YYYY') as year,
to_char(l.date, 'MM') as month,
sum(l.amount) as cost,
sum(l.unit_amount) as quantity,
l.account_id as account_id,
addons/hr_timesheet_sheet/report/timesheet_report.py
+5
View File
@@ -46,6 +46,7 @@ class timesheet_report(osv.osv):
'department_id':fields.many2one('hr.department','Department',readonly=True),
'date_from': fields.date('Date from',readonly=True,),
'date_to': fields.date('Date to',readonly=True),
'date_current': fields.date('Current date', required=True),
'state' : fields.selection([
('new', 'New'),
('draft','Draft'),
@@ -64,6 +65,9 @@ class timesheet_report(osv.osv):
htss.name,
htss.date_from,
htss.date_to,
to_char(htss.date_from, 'YYYY-MM-DD') as day,
to_char(htss.date_from, 'YYYY') as year,
to_char(htss.date_from, 'MM') as month,
count(*) as nbr,
aal.unit_amount as quantity,
aal.amount as cost,
@@ -105,6 +109,7 @@ class timesheet_report(osv.osv):
htss.id,
htss.department_id,
htss.user_id
)
""")
timesheet_report()