Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-592846-msh into lp:openobject-addons/7.0

  1. 7.0-opw-592846-msh
  2. Merge into 7.0
Proposed by Mohammed Shekha(Open ERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 9447
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-592846-msh
Merge into: lp:openobject-addons/7.0
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/7.0-opw-592846-msh
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp (community) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+165106@code.launchpad.net

Description of the change

Hello,

Fixed the issue of timezone on total attendance on My current timesheet view.

To reproduce please go through bug https://bugs.launchpad.net/openobject-addons/+bug/1178623.

Thanks.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) :
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 2013-05-08 08:59:38 +0000
3+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2013-05-22 12:57:45 +0000
4@@ -464,7 +464,7 @@
5 THEN (SUM(total_attendance) +
6 CASE WHEN current_date <> name
7 THEN 1440
8- ELSE (EXTRACT(hour FROM current_time) * 60) + EXTRACT(minute FROM current_time)
9+ ELSE (EXTRACT(hour FROM current_time AT TIME ZONE 'UTC') * 60) + EXTRACT(minute FROM current_time AT TIME ZONE 'UTC')
10 END
11 )
12 ELSE SUM(total_attendance)