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

[Lorenzo Battistini]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

[Stéphane Bidoul (Acsone) (sbi)]

LGTM.

This one has been merged in https://code.launchpad.net/~acsone-openerp/hr-timesheet/hr_attendance_analysis_externalise_contract_calendar

review: Approve (code review)

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2013-05-31 10:15:39 +0000
+++ hr_attendance_analysis/hr_attendance.py	2013-07-16 07:29:28 +0000
@@ -182,6 +182,7 @@
                 attendance.name, '%Y-%m-%d %H:%M:%S'
                 ).replace(tzinfo=pytz.utc).astimezone(active_tz)
             next_attendance_date = str_now
+            next_attendance_ids = False
             # should we compute for sign out too?
             if attendance.action == 'sign_in':
                 next_attendance_ids = self.search(cr, uid, [
@@ -211,7 +212,7 @@
             active_contract_ids = self.get_active_contracts(
                 cr, uid, attendance.employee_id.id, date=str_now[:10])
 
-            if active_contract_ids:
+            if active_contract_ids and next_attendance_ids:
                 contract = contract_pool.browse(cr, uid, active_contract_ids[0])
                 if contract.working_hours:
                     # TODO applicare prima arrotondamento o tolleranza?