[FIX] hr_timesheet_sheet : Weekly timesheet created on monday covers two weeks
lp bug: https://launchpad.net/bugs/897662 fixed bzr revid: mdi@tinyerp.com-20111208062856-y957nmoedj2nwxk5
This commit is contained in:
committed by
Divyesh Makwana (Open ERP)
parent
59191db574
commit
d47cfde798
@@ -294,7 +294,7 @@ class hr_timesheet_sheet(osv.osv):
|
||||
if r=='month':
|
||||
return time.strftime('%Y-%m-01')
|
||||
elif r=='week':
|
||||
return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
|
||||
return (datetime.today() + relativedelta(weekday=0, days=-6)).strftime('%Y-%m-%d')
|
||||
elif r=='year':
|
||||
return time.strftime('%Y-01-01')
|
||||
return time.strftime('%Y-%m-%d')
|
||||
|
||||
Reference in New Issue
Block a user