Merge lp:~openerp-dev/openobject-addons/trunk-addons19-hr-pna into lp:openobject-addons

[Pinakin Nayi (OpenERP)]

Hello Sir,

 I improved string in Hr => Tracking => Timesheets from his to is.

Thanks,
pna

[lp:~openerp-dev/openobject-addons/trunk-addons19-hr-pna]

7836. By Pinakin Nayi (OpenERP) on 2012-10-30

[MERGE]with trunk

7837. By Pinakin Nayi (OpenERP) on 2012-10-30

[IMP]hr attendance sign in sign out problem

7838. By Pinakin Nayi (OpenERP) on 2012-10-31

[IMP]employee cannot sign out before sign in

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Pinakin,

Sign in - Sign out must not allow overlaps with each other. Please fix the problem.

Thanks,
Divyesh

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

Current trunk behaviour is right, We cannot allow Sign-in and Sign-out to overlaps with each other.

For more details see the following bug and its related mp:

Bug : https://bugs.launchpad.net/openobject-addons/+bug/885387

MP : https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-885387-mdi/+merge/86388

So, I am rejecting this merge proposal.

Thanks,
Divyesh

review: Disapprove

Unmerged revisions

7838. By Pinakin Nayi (OpenERP) on 2012-10-31

[IMP]employee cannot sign out before sign in

7837. By Pinakin Nayi (OpenERP) on 2012-10-30

[IMP]hr attendance sign in sign out problem

7836. By Pinakin Nayi (OpenERP) on 2012-10-30

[MERGE]with trunk

7835. By Pinakin Nayi (OpenERP) on 2012-10-23

[IMP]improve string

=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py	2012-10-21 19:59:25 +0000
+++ hr_attendance/hr_attendance.py	2012-10-31 11:29:22 +0000
@@ -70,17 +70,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)
-            # 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
-                return False
-            if next_atts and next_atts[0].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
+            emp_obj = self.pool.get('hr.employee')
+            warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out'), 'action': _('Change Work')}
+            emp = emp_obj.browse(cr, uid, att.employee_id.id, context=context)
+            #if employee state is present than attendance action must be sign in
+            if emp.state == 'present':
+                if att.action == 'sign_out':
+                    if not emp_obj._action_check(cr, uid, att.employee_id.id, att.name, context):
+                        raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[att.action],))
+                    return False
+            if emp.state == 'absent':
+                if att.action == 'sign_in':
+                    return False
         return True
 
     _constraints = [(_altern_si_so, 'Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
@@ -100,15 +101,15 @@
             result[id] = 'absent'
         cr.execute('SELECT hr_attendance.action, hr_attendance.employee_id \
                 FROM ( \
-                    SELECT MAX(name) AS name, employee_id \
+                    SELECT name AS name, employee_id \
                     FROM hr_attendance \
                     WHERE action in (\'sign_in\', \'sign_out\') \
-                    GROUP BY employee_id \
+                    GROUP BY name,employee_id \
                 ) AS foo \
                 LEFT JOIN hr_attendance \
                     ON (hr_attendance.employee_id = foo.employee_id \
                         AND hr_attendance.name = foo.name) \
-                WHERE hr_attendance.employee_id IN %s',(tuple(ids),))
+                WHERE hr_attendance.employee_id IN %s order by id',(tuple(ids),))
         for res in cr.fetchall():
             result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
         return result
@@ -119,9 +120,9 @@
             return result
         for id in ids:
             result[id] = False
-            cr.execute("""select max(name) as name
+            cr.execute("""select name as name
                         from hr_attendance
-                        where action in ('sign_in', 'sign_out') and employee_id = %s""",(id,))
+                        where action in ('sign_in', 'sign_out') and employee_id = %s order by id desc limit 1""",(id,))
             for res in cr.fetchall():
                 result[id] = res[0]
         return result
@@ -141,7 +142,7 @@
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
-        cr.execute('SELECT MAX(name) FROM hr_attendance WHERE employee_id=%s', (emp_id,))
+        cr.execute('SELECT name FROM hr_attendance where employee_id=%s and action in (\'sign_in\',\'action\') order by id desc limit 1', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
@@ -151,14 +152,15 @@
         action_date = context.get('action_date', False)
         action = context.get('action', False)
         hr_attendance = self.pool.get('hr.attendance')
-        warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
+        warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out'), 'action': _('Change Work')}
         for employee in self.browse(cr, uid, ids, context=context):
             if not action:
                 if employee.state == 'present': action = 'sign_out'
                 if employee.state == 'absent': action = 'sign_in'
 
-            if not self._action_check(cr, uid, employee.id, action_date, context):
-                raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
+            if action != 'sign_in':
+                if not self._action_check(cr, uid, employee.id, action_date, context):
+                    raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
 
             vals = {'action': action, 'employee_id': employee.id}
             if action_date:

=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2012-10-24 20:14:24 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2012-10-31 11:29:22 +0000
@@ -47,7 +47,7 @@
 
     def _get_empid2(self, cr, uid, context=None):
         res = self._get_empid(cr, uid, context=context)
-        cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],))
+        cr.execute('select name,action from hr_attendance where employee_id=%s order by id desc limit 1', (res['emp_id'],))
 
         res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S')
         date_start = cr.fetchone()
@@ -136,7 +136,7 @@
         obj_model = self.pool.get('ir.model.data')
         emp_id = self.default_get(cr, uid, context)['emp_id']
         # get the latest action (sign_in or out) for this employee
-        cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
+        cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by id desc limit 1', (emp_id,))
         res = (cr.fetchone() or ('sign_out',))[0]
         in_out = (res == 'sign_out') and 'in' or 'out'
         #TODO: invert sign_in et sign_out