Merge lp:~elbati/hr-timesheet/7.0_fix_1193384_elbati into lp:~hr-core-editors/hr-timesheet/7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 47
Proposed branch: lp:~elbati/hr-timesheet/7.0_fix_1193384_elbati
Merge into: lp:~hr-core-editors/hr-timesheet/7.0
Diff against target: 28 lines (+3/-3)
1 file modified
hr_attendance_analysis/hr_attendance.py (+3/-3)
To merge this branch: bzr merge lp:~elbati/hr-timesheet/7.0_fix_1193384_elbati
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Review via email: mp+170971@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_attendance_analysis/hr_attendance.py'
2--- hr_attendance_analysis/hr_attendance.py 2013-05-31 10:15:39 +0000
3+++ hr_attendance_analysis/hr_attendance.py 2013-06-23 07:34:27 +0000
4@@ -20,12 +20,12 @@
5 #
6 ##############################################################################
7
8+from __future__ import division
9 from openerp.osv import fields, orm
10 from openerp.tools.translate import _
11 import time
12 from datetime import *
13 import math
14-from __future__ import division
15
16 import pytz
17
18@@ -109,8 +109,8 @@
19 res = []
20 while (duration > precision):
21 res.append((start_datetime, precision))
22- start_datetime += timedelta(days=0,seconds=0,microseconds=0,milliseconds=0,
23- minutes=0,precision)
24+ start_datetime += timedelta(days=0, seconds=0, microseconds=0, milliseconds=0,
25+ minutes=0, hours=precision)
26 duration -= precision
27 if duration > precision / 2.0:
28 res.append((start_datetime, precision))

Subscribers

People subscribed via source and target branches