DHS(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-50628-dhs into
lp:openobject-addons/6.0.
Requested reviews:
Vinay Rana (openerp) (vra-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-50628-dhs/+merge/83133
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-50628-dhs/+merge/83133
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-50628-dhs.
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py 2011-01-17 11:20:56 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2011-11-23 10:18:30 +0000
@@ -21,7 +21,7 @@
import time
from datetime import datetime
-from dateutil.relativedelta import relativedelta
+from dateutil.relativedelta import relativedelta, MO
from osv import fields, osv
from tools.translate import _
@@ -297,7 +297,7 @@
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=MO(-1))).strftime('%Y-%m-%d')
elif r=='year':
return time.strftime('%Y-01-01')
return time.strftime('%Y-%m-%d')
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
