Merge lp:~openerp-dev/openobject-addons/7.0-fixtimesheet-dle into lp:openobject-addons/7.0

[Denis Ledoux (OpenERP)]

[lp:~openerp-dev/openobject-addons/7.0-fixtimesheet-dle]

9416. By Launchpad Translations on behalf of openerp on 2013-09-06

Launchpad automatic translations update.

9417. By Denis Ledoux (OpenERP) on 2013-09-06

[FIX]hr_attendance: change alternance constraint, now taking account of the sheet_id

Unmerged revisions

9417. By Denis Ledoux (OpenERP) on 2013-09-06

[FIX]hr_attendance: change alternance constraint, now taking account of the sheet_id

=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py	2012-12-10 11:16:54 +0000
+++ hr_attendance/hr_attendance.py	2013-09-06 12:50:16 +0000
@@ -63,6 +63,16 @@
         'employee_id': _employee_get,
     }
 
+    def _get_next_and_prev(self, att):
+        cr = att._cr
+        uid = att._uid
+        context = att._context
+        prev_att_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '<', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name DESC')
+        next_add_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '>', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name ASC')
+        prev_atts = self.browse(cr, uid, prev_att_ids, context=context)
+        next_atts = self.browse(cr, uid, next_add_ids, context=context)
+        return (prev_atts and prev_atts[0] or None, next_atts and next_atts[0] or None)
+
     def _altern_si_so(self, cr, uid, ids, context=None):
         """ Alternance sign_in/sign_out check.
             Previous (if exists) must be of opposite action.
@@ -70,20 +80,18 @@
         """
         for att in self.browse(cr, uid, ids, context=context):
             # search and browse for first previous and first next records
-            prev_att_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '<', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name DESC')
-            next_add_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '>', att.name), ('action', 'in', ('sign_in', 'sign_out'))], limit=1, order='name ASC')
-            prev_atts = self.browse(cr, uid, prev_att_ids, context=context)
-            next_atts = self.browse(cr, uid, next_add_ids, context=context)
+            
+            prev_atts, next_atts = self._get_next_and_prev(att)
             # check for alternance, return False if at least one condition is not satisfied
-            if prev_atts and prev_atts[0].action == att.action: # previous exists and is same action
+            if prev_atts and prev_atts.action == att.action: # previous exists and is same action
                 return False
-            if next_atts and next_atts[0].action == att.action: # next exists and is same action
+            if next_atts and next_atts.action == att.action: # next exists and is same action
                 return False
             if (not prev_atts) and (not next_atts) and att.action != 'sign_in': # first attendance must be sign_in
                 return False
         return True
 
-    _constraints = [(_altern_si_so, 'Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
+    _constraints = [(lambda s, *a, **kw: s._altern_si_so(*a, **kw), 'Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
     _order = 'name desc'
 
 hr_attendance()

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-08 08:59:38 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-09-06 12:50:16 +0000
@@ -429,6 +429,16 @@
                 raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet'))
         return True
 
+    def _get_next_and_prev(self, att):
+        cr = att._cr
+        uid = att._uid
+        context = att._context
+        prev_att_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '<', att.name), ('action', 'in', ('sign_in', 'sign_out')), ('sheet_id', '=', att.sheet_id.id)], limit=1, order='name DESC')
+        next_add_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id), ('name', '>', att.name), ('action', 'in', ('sign_in', 'sign_out')), ('sheet_id', '=', att.sheet_id.id)], limit=1, order='name ASC')
+        prev_atts = self.browse(cr, uid, prev_att_ids, context=context)
+        next_atts = self.browse(cr, uid, next_add_ids, context=context)
+        return (prev_atts and prev_atts[0] or None, next_atts and next_atts[0] or None)
+
 hr_attendance()
 
 class hr_timesheet_sheet_sheet_day(osv.osv):