Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-897662-mdi into lp:openobject-addons

  1. trunk-bug-897662-mdi
  2. Merge into trunk
Proposed by DJ Patel (OpenERP)
Status: Merged
Merged at revision: 6001
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-897662-mdi
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
hr_timesheet_sheet/hr_timesheet_sheet.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-897662-mdi
Reviewer Review Type Date Requested Status
Purnendu Singh (OpenERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+84895@code.launchpad.net

Description of the change

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/897662 "Weekly timesheet created on monday covers two weeks".

Thanks and Regards,

Divyesh Makwana(MDI)

To post a comment you must log in.
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
2--- hr_timesheet_sheet/hr_timesheet_sheet.py 2011-11-09 18:12:56 +0000
3+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2011-12-08 06:38:49 +0000
4@@ -294,7 +294,7 @@
5 if r=='month':
6 return time.strftime('%Y-%m-01')
7 elif r=='week':
8- return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
9+ return (datetime.today() + relativedelta(weekday=0, days=-6)).strftime('%Y-%m-%d')
10 elif r=='year':
11 return time.strftime('%Y-01-01')
12 return time.strftime('%Y-%m-%d')

Subscribers

People subscribed via source and target branches

to all changes: