Merge lp:~acsone-openerp/hr-timesheet/7.0_fix_1199795 into lp:~hr-core-editors/hr-timesheet/7.0

[Laetitia Gangloff (Acsone)]

Fix the bug https://bugs.launchpad.net/hr-timesheet/+bug/1199795

[Lorenzo Battistini (elbati)]

Instead of importing osv, use except_orm

review: Needs Fixing

[lp:~acsone-openerp/hr-timesheet/7.0_fix_1199795]

48. By Laetitia Gangloff (Acsone) on 2013-07-16

hr_attendance_analysis: replace osv.except_osv by orm.except_orm

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

as you suggest, I replace all osv.except_osv by orm.except_orm.

Thank you,
Laetitia

[Lorenzo Battistini (elbati)]

Thanks

review: Approve

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

LGTM

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2013-07-16 07:42:28 +0000
+++ hr_attendance_analysis/hr_attendance.py	2013-07-16 07:42:28 +0000
@@ -64,7 +64,7 @@
         if hours / 24 > 0:
             days += hours / 24
             hours = hours % 24
-        return datetime(1900, 1, days, hours, minutes)
+        return datetime(1900, 1, int(days), hours, minutes)
 
     def float_to_timedelta(self, float_val):
         str_time = self.float_time_convert(float_val)
@@ -76,7 +76,7 @@
 
     def time_difference(self, float_start_time, float_end_time):
         if float_end_time < float_start_time:
-            raise osv.except_osv(_('Error'), _('End time %s < start time %s')
+            raise orm.except_orm(_('Error'), _('End time %s < start time %s')
                 % (str(float_end_time),str(float_start_time)))
         delta = self.float_to_datetime(float_end_time) - self.float_to_datetime(
             float_start_time)
@@ -147,9 +147,10 @@
             ('trial_date_end', '>=', date),
             ])
         if len(active_contract_ids) > 1:
-            raise osv.except_osv(_('Error'), _(
+            employee = self.pool.get('hr.employee').browse(cr,uid,employee_id)
+            raise orm.except_orm(_('Error'), _(
                 'Too many active contracts for employee %s'
-                ) % attendance.employee_id.name)
+                ) % employee.name)
         return active_contract_ids
 
     def _ceil_rounding(self, rounding, datetime):
@@ -191,7 +192,7 @@
                     next_attendance = self.browse(cr, uid, next_attendance_ids[0])
                     if next_attendance.action == 'sign_in':
                          # 2012.10.16 LF FIX : Attendance in context timezone
-                         raise osv.except_osv(_('Error'), _(
+                         raise orm.except_orm(_('Error'), _(
                             'Incongruent data: sign-in %s is followed by another sign-in'
                             ) % attendance_start)
                     next_attendance_date = next_attendance.name
@@ -273,7 +274,7 @@
                             ('hour_from','<=',centered_attendance_hour),
                             ])
                         if len(matched_schedule_ids) > 1:
-                            raise osv.except_osv(_('Error'),
+                            raise orm.except_orm(_('Error'),
                                 _('Wrongly configured working schedule with id %s') % str(calendar_id))
                         if matched_schedule_ids:
                             intervals_within += 1

=== modified file 'hr_attendance_analysis/wizard/print_calendar_report.py'
--- hr_attendance_analysis/wizard/print_calendar_report.py	2013-05-31 10:15:39 +0000
+++ hr_attendance_analysis/wizard/print_calendar_report.py	2013-07-16 07:42:28 +0000
@@ -83,7 +83,7 @@
         from_date = datetime.strptime(form['from_date'], '%Y-%m-%d')
         to_date = datetime.strptime(form['to_date'], '%Y-%m-%d')
         if from_date > to_date:
-            raise osv.except_osv(_('Error'), _('From date must be < to date'))
+            raise orm.except_orm(_('Error'), _('From date must be < to date'))
         employee_ids=form['employee_ids']
         delta = to_date - from_date
         max_number_of_attendances_per_day = 0
@@ -172,7 +172,7 @@
                                 calendar_attendance_duration = attendance_pool.time_difference(
                                     calendar_attendance.hour_from, calendar_attendance.hour_to)
                                 if calendar_attendance_duration < 0:
-                                    raise osv.except_osv(_('Error'),
+                                    raise orm.except_orm(_('Error'),
                                         _("%s: 'Work to' is < 'Work from'")
                                         % calendar_attendance.name)
                                 current_total_due = attendance_pool.time_sum(current_total_due,