##############################################################################
import time
-from datetime import datetime
+from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
from osv import fields, osv
if values is None:
values = {}
- # dict:
- # {idn: (date_current, user_id), ...
- # 1: ('2010-08-15', 1)}
- res6 = dict([(rec['id'], (rec['date_current'], rec['user_id'][0]))
- for rec
- in obj.read(cr, user, ids, ['date_current', 'user_id'], context=context)])
+ # res6: {id: date_current, ...}
+ res6 = dict([(rec['id'], rec['date_current'])
+ for rec in obj.read(cr, user, ids, ['date_current'], context=context)])
- # eg: ['|', '|',
- # '&', '&', ('name', '>=', '2011-03-01'), ('name', '<=', '2011-03-01'), ('employee_id.user_id', '=', 1),
- # '&', '&', ('name', '>=', '2011-02-01'), ('name', '<=', '2011-02-01'), ('employee_id.user_id', '=', 1)]
dom = []
for c, id in enumerate(ids):
if id in res6:
dom.insert(0 ,'|')
dom.append('&')
dom.append('&')
- dom.append(('name', '>=', res6[id][0]))
- dom.append(('name', '<=', res6[id][0]))
- dom.append(('employee_id.user_id', '=', res6[id][1]))
+ dom.append(('name', '>=', res6[id]))
+ dom.append(('name', '<=', res6[id]))
+ dom.append(('sheet_id', '=', id))
ids2 = obj.pool.get(self._obj).search(cr, user, dom, limit=self._limit)
for i in ids:
res[i] = []
- for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+ for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_read'):
if r[self._fields_id]:
res[r[self._fields_id][0]].append(r['id'])
-
return res
def set(self, cr, obj, id, field, values, user=None, context=None):
if values is None:
values = {}
-
- res5 = obj.read(cr, user, ids, ['date_current', 'user_id'], context=context)
- res6 = {}
- for r in res5:
- res6[r['id']] = (r['date_current'], r['user_id'][0])
+ res6 = dict([(rec['id'], rec['date_current'])
+ for rec in obj.read(cr, user, ids, ['date_current'], context=context)])
ids2 = []
for id in ids:
dom = []
if id in res6:
- dom = [('date', '=', res6[id][0]), ('user_id', '=', res6[id][1])]
+ dom = [('date', '=', res6[id]), ('sheet_id', '=', id)]
ids2.extend(obj.pool.get(self._obj).search(cr, user,
dom, limit=self._limit))
res = {}
for i in ids:
res[i] = []
for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2,
- [self._fields_id], context=context, load='_classic_write'):
+ [self._fields_id], context=context, load='_classic_read'):
if r[self._fields_id]:
res[r[self._fields_id][0]].append(r['id'])
return res
+
class hr_timesheet_sheet(osv.osv):
_name = "hr_timesheet_sheet.sheet"
_table = 'hr_timesheet_sheet_sheet'
_order = "id desc"
_description="Timesheet"
- def _total_day(self, cr, uid, ids, name, args, context=None):
+ def _total_attendances(self, cr, uid, ids, name, args, context=None):
+ """
+ Get the total attendance for the timesheets
+ Returns a dict like :
+ {id: {'date_current': '2011-06-17',
+ 'totals_per_day': {
+ day: timedelta,
+ day: timedelta}
+ }
+ }
+ """
+ context = context or {}
+ attendance_obj = self.pool.get('hr.attendance')
res = {}
- cr.execute('SELECT sheet.id, day.total_attendance, day.total_timesheet, day.total_difference\
- FROM hr_timesheet_sheet_sheet AS sheet \
- LEFT JOIN hr_timesheet_sheet_sheet_day AS day \
- ON (sheet.id = day.sheet_id \
- AND day.name = sheet.date_current) \
- WHERE sheet.id IN %s',(tuple(ids),))
- for record in cr.fetchall():
- res[record[0]] = {}
- res[record[0]]['total_attendance_day'] = record[1]
- res[record[0]]['total_timesheet_day'] = record[2]
- res[record[0]]['total_difference_day'] = record[3]
+ for sheet_id in ids:
+ sheet = self.browse(cr, uid, sheet_id, context)
+ date_current = sheet.date_current
+ # field attendances_ids of hr_timesheet_sheet.sheet only
+ # returns attendances of timesheet's current date
+ attendance_ids = attendance_obj.search(cr, uid, [('sheet_id', '=', sheet_id)], context=context)
+ attendances = attendance_obj.browse(cr, uid, attendance_ids, context=context)
+ total_attendance = {}
+ for attendance in [att for att in attendances
+ if att.action in ('sign_in', 'sign_out')]:
+ day = attendance.name[:10]
+ if not total_attendance.get(day, False):
+ total_attendance[day] = timedelta(seconds=0)
+
+ attendance_in_time = datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S')
+ attendance_interval = timedelta(hours=attendance_in_time.hour,
+ minutes=attendance_in_time.minute,
+ seconds=attendance_in_time.second)
+ if attendance.action == 'sign_in':
+ total_attendance[day] -= attendance_interval
+ else:
+ total_attendance[day] += attendance_interval
+
+ # if the delta is negative, it means that a sign out is missing
+ # in a such case, we want to have the time to the end of the day
+ # for a past date, and the time to now for the current date
+ if total_attendance[day] < timedelta(0):
+ if day == date_current:
+ now = datetime.now()
+ total_attendance[day] += timedelta(hours=now.hour,
+ minutes=now.minute,
+ seconds=now.second)
+ else:
+ total_attendance[day] += timedelta(days=1)
+
+ res[sheet_id] = {'date_current': date_current,
+ 'totals_per_day': total_attendance}
return res
- def _total(self, cr, uid, ids, name, args, context=None):
+ def _total_timesheet(self, cr, uid, ids, name, args, context=None):
+ """
+ Get the total of analytic lines for the timesheets
+ Returns a dict like :
+ {id: {day: timedelta,
+ day: timedelta,}}
+ """
+ context = context or {}
+ sheet_line_obj = self.pool.get('hr.analytic.timesheet')
+
res = {}
- cr.execute('SELECT s.id, COALESCE(SUM(d.total_attendance),0), COALESCE(SUM(d.total_timesheet),0), COALESCE(SUM(d.total_difference),0) \
- FROM hr_timesheet_sheet_sheet s \
- LEFT JOIN hr_timesheet_sheet_sheet_day d \
- ON (s.id = d.sheet_id) \
- WHERE s.id IN %s GROUP BY s.id',(tuple(ids),))
- for record in cr.fetchall():
- res[record[0]] = {}
- res[record[0]]['total_attendance'] = record[1]
- res[record[0]]['total_timesheet'] = record[2]
- res[record[0]]['total_difference'] = record[3]
+ for sheet_id in ids:
+ # field timesheet_ids of hr_timesheet_sheet.sheet only
+ # returns lines of timesheet's current date
+ sheet_lines_ids = sheet_line_obj.search(cr, uid, [('sheet_id', '=', sheet_id)], context=context)
+ sheet_lines = sheet_line_obj.browse(cr, uid, sheet_lines_ids, context=context)
+ total_timesheet = {}
+ for line in sheet_lines:
+ day = line.date
+ if not total_timesheet.get(day, False):
+ total_timesheet[day] = timedelta(seconds=0)
+ total_timesheet[day] += timedelta(hours=line.unit_amount)
+ res[sheet_id] = total_timesheet
return res
- def _state_attendance(self, cr, uid, ids, name, args, context=None):
- emp_obj = self.pool.get('hr.employee')
- result = {}
- link_emp = {}
- emp_ids = []
+ def _total(self, cr, uid, ids, name, args, context=None):
+ """
+ Compute the attendances, analytic lines timesheets and differences between them
+ for all the days of a timesheet and the current day
+ """
+ def sum_all_days(sheet_amounts):
+ if not sheet_amounts:
+ return timedelta(seconds=0)
+ total = reduce(lambda memo, value: memo + value, sheet_amounts.values())
+ return total
+
+ def timedelta_to_hours(delta):
+ hours = delta.days * 24 + float(delta.seconds) / 3600
+ if delta.microseconds:
+ hours += float(delta.microseconds) / 3600000000
+ return hours
- for sheet in self.browse(cr, uid, ids, context=context):
- result[sheet.id] = 'none'
- emp_ids2 = emp_obj.search(cr, uid,
- [('user_id', '=', sheet.user_id.id)], context=context)
- if emp_ids2:
- link_emp[emp_ids2[0]] = sheet.id
- emp_ids.append(emp_ids2[0])
- for emp in emp_obj.browse(cr, uid, emp_ids, context=context):
- if emp.id in link_emp:
- sheet_id = link_emp[emp.id]
- result[sheet_id] = emp.state
- return result
+ res = {}
+ all_timesheet_attendances = self._total_attendances(cr, uid, ids, name, args, context)
+ all_timesheet_lines = self._total_timesheet(cr, uid, ids, name, args, context)
+ for id in ids:
+ res[id] = {}
+
+ all_attendances_sheet = all_timesheet_attendances[id]
+
+ date_current = all_attendances_sheet['date_current']
+ total_attendances_sheet = all_attendances_sheet['totals_per_day']
+ total_attendances_all_days = sum_all_days(total_attendances_sheet)
+ total_attendances_day = total_attendances_sheet.get(date_current, timedelta(seconds=0))
+
+ total_timesheets_sheet = all_timesheet_lines[id]
+ total_timesheets_all_days = sum_all_days(total_timesheets_sheet)
+ total_timesheets_day = total_timesheets_sheet.get(date_current, timedelta(seconds=0))
+
+ total_difference_all_days = total_attendances_all_days - total_timesheets_all_days
+ total_difference_day = total_attendances_day - total_timesheets_day
+
+ res[id]['total_attendance'] = timedelta_to_hours(total_attendances_all_days)
+ res[id]['total_timesheet'] = timedelta_to_hours(total_timesheets_all_days)
+ res[id]['total_difference'] = timedelta_to_hours(total_difference_all_days)
+
+ res[id]['total_attendance_day'] = timedelta_to_hours(total_attendances_day)
+ res[id]['total_timesheet_day'] = timedelta_to_hours(total_timesheets_day)
+ res[id]['total_difference_day'] = timedelta_to_hours(total_difference_day)
+ return res
def check_employee_attendance_state(self, cr, uid, sheet_id, context=None):
ids_signin = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_in')])
ids_signout = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_out')])
if len(ids_signin) != len(ids_signout):
- raise osv.except_osv(('Warning !'),_('The timesheet cannot be validated as it does not contain equal no. of sign ins and sign outs!'))
+ raise osv.except_osv(('Warning !'),_('The timesheet cannot be validated as it does not contain an equal number of sign ins and sign outs!'))
return True
def copy(self, cr, uid, ids, *args, **argv):
- raise osv.except_osv(_('Error !'), _('You cannot duplicate a timesheet !'))
+ raise osv.except_osv(_('Error !'), _('You cannot duplicate a timesheet!'))
+
def create(self, cr, uid, vals, *args, **argv):
if 'employee_id' in vals:
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
- raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign it to a user!'))
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'!'))
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign the employee to an analytic journal, like \'Timesheet\'!'))
return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)
def write(self, cr, uid, ids, vals, *args, **argv):
if 'employee_id' in vals:
new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
if not new_user_id:
- raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign it to a user!'))
if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
- raise osv.except_osv(_('Error !'), _('You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.'))
+ raise osv.except_osv(_('Error !'), _('You cannot have 2 timesheets that overlaps!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must link the employee to a product!'))
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+ raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign the employee to an analytic journal!'))
return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
def button_confirm(self, cr, uid, ids, context=None):
self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
return True
- def sign(self, cr, uid, ids, typ, context=None):
- emp_obj = self.pool.get('hr.employee')
+ def check_sign(self, cr, uid, ids, typ, context=None):
sheet = self.browse(cr, uid, ids, context=context)[0]
- if context is None:
- context = {}
if not sheet.date_current == time.strftime('%Y-%m-%d'):
- raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
- emp_id = sheet.employee_id.id
- context['sheet_id']=ids[0]
- emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)
+ raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
return True
+ def sign(self, cr, uid, ids, typ, context=None):
+ self.check_sign(cr, uid, ids, typ, context=context)
+ sign_obj = self.pool.get('hr.sign.in.out')
+ sheet = self.browse(cr, uid, ids, context=context)[0]
+ context['emp_id'] = [sheet.employee_id.id]
+ sign_id = sign_obj.create(cr, uid, {}, context=context)
+ methods = {'sign_in': sign_obj.si_check,
+ 'sign_out': sign_obj.so_check}
+ wizard_result = methods[typ](cr, uid, [sign_id], context=context)
+ if wizard_result.get('type', False) == 'ir.actions.act_window_close':
+ return True # ensure we do not close the main window !
+ wizard_result['nodestroy'] = True # do not destroy the main window !
+ return wizard_result
+
def sign_in(self, cr, uid, ids, context=None):
- return self.sign(cr,uid,ids,'sign_in',context=None)
+ return self.sign(cr, uid, ids, 'sign_in', context=context)
def sign_out(self, cr, uid, ids, context=None):
- return self.sign(cr,uid,ids,'sign_out',context=None)
+ return self.sign(cr, uid, ids, 'sign_out', context=context)
_columns = {
- 'name': fields.char('Description', size=64, select=1,
+ 'name': fields.char('Note', size=64, select=1,
states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}),
'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
'user_id': fields.related('employee_id', 'user_id', type="many2one", relation="res.users", store=True, string="User", required=False, readonly=True),#fields.many2one('res.users', 'User', required=True, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}),
'date_from': fields.date('Date from', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
'date_to': fields.date('Date to', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
- 'date_current': fields.date('Current date', required=True),
+ 'date_current': fields.date('Current date', required=True, select=1),
'timesheet_ids' : one2many_mod('hr.analytic.timesheet', 'sheet_id',
'Timesheet lines', domain=[('date', '=', time.strftime('%Y-%m-%d'))],
readonly=True, states={
'draft': [('readonly', False)],
'new': [('readonly', False)]}
),
- 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
+ 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
'state' : fields.selection([
('new', 'New'),
- ('draft','Draft'),
- ('confirm','Confirmed'),
- ('done','Done')], 'State', select=True, required=True, readonly=True,
+ ('draft','Open'),
+ ('confirm','Waiting Approval'),
+ ('done','Approved')], 'State', select=True, required=True, readonly=True,
help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \
\n* The \'Confirmed\' state is used for to confirm the timesheet by user. \
\n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'),
- 'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
- 'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance', multi="_total_day"),
- 'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet', multi="_total_day"),
- 'total_difference_day': fields.function(_total_day, method=True, string='Difference', multi="_total_day"),
- 'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total_sheet"),
- 'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total_sheet"),
- 'total_difference': fields.function(_total, method=True, string='Difference', multi="_total_sheet"),
+ 'state_attendance' : fields.related('employee_id', 'state', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Current Status', readonly=True),
+ 'total_attendance_day': fields.function(_total, method=True, string='Total Attendance', multi="_total"),
+ 'total_timesheet_day': fields.function(_total, method=True, string='Total Timesheet', multi="_total"),
+ 'total_difference_day': fields.function(_total, method=True, string='Difference', multi="_total"),
+ 'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total"),
+ 'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total"),
+ 'total_difference': fields.function(_total, method=True, string='Difference', multi="_total"),
'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
'company_id': fields.many2one('res.company', 'Company'),
return time.strftime('%Y-12-31')
return time.strftime('%Y-%m-%d')
- def _default_employee(self,cr, uid, context=None):
+ def _default_employee(self, cr, uid, context=None):
emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
return emp_ids and emp_ids[0] or False
if new_user_id:
cr.execute('SELECT id \
FROM hr_timesheet_sheet_sheet \
- WHERE (date_from < %s and %s < date_to) \
+ WHERE (date_from <= %s and %s <= date_to) \
AND user_id=%s \
AND id <> %s',(sheet.date_to, sheet.date_from, new_user_id, sheet.id))
if cr.fetchall():
_constraints = [
- (_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
+ (_sheet_date, 'You cannot have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
(_date_current_check, 'You must select a Current date which is in the timesheet dates !', ['date_current']),
]
sheets = self.read(cr, uid, ids, ['state','total_attendance'], context=context)
for sheet in sheets:
if sheet['state'] in ('confirm', 'done'):
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which are already confirmed !'))
+ raise osv.except_osv(_('Invalid action !'), _('You cannot delete a timesheet which is already confirmed!'))
elif sheet['total_attendance'] <> 0.00:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which have attendance entries encoded !'))
+ raise osv.except_osv(_('Invalid action !'), _('You cannot delete a timesheet which have attendance entries!'))
return super(hr_timesheet_sheet, self).unlink(cr, uid, ids, context=context)
+ def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+ department_id = False
+ if employee_id:
+ department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
+ return {'value': {'department_id': department_id}}
+
hr_timesheet_sheet()
def _sheet(self, cursor, user, ids, name, args, context=None):
sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
- cursor.execute('SELECT l.id, COALESCE(MAX(s.id), 0) \
- FROM hr_timesheet_sheet_sheet s \
- LEFT JOIN (hr_analytic_timesheet l \
- LEFT JOIN account_analytic_line al \
- ON (l.line_id = al.id)) \
- ON (s.date_to >= al.date \
- AND s.date_from <= al.date \
- AND s.user_id = al.user_id) \
- WHERE l.id IN %s GROUP BY l.id',(tuple(ids),))
- res = dict(cursor.fetchall())
- sheet_names = {}
- for sheet_id, name in sheet_obj.name_get(cursor, user, res.values(),
- context=context):
- sheet_names[sheet_id] = name
-
- for line_id in {}.fromkeys(ids):
- sheet_id = res.get(line_id, False)
- if sheet_id:
- res[line_id] = (sheet_id, sheet_names[sheet_id])
- else:
- res[line_id] = False
+ res = dict.fromkeys(ids, False)
+ for ts_line in self.browse(cursor, user, ids, context=context):
+ sheet_ids = sheet_obj.search(cursor, user,
+ [('date_to', '>=', ts_line.date),
+ ('date_from', '<=', ts_line.date),
+ ('employee_id.user_id', '=', ts_line.user_id.id)], context=context)
+ if sheet_ids:
+ # [0] because only one sheet possible for an employee between 2 dates
+ res[ts_line.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
return res
- def _sheet_search(self, cursor, user, obj, name, args, context=None):
- if not len(args):
- return []
- sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
-
- i = 0
- while i < len(args):
- fargs = args[i][0].split('.', 1)
- if len(fargs) > 1:
- args[i] = (fargs[0], 'in', sheet_obj.search(cursor, user,
- [(fargs[1], args[i][1], args[i][2])], context=context))
- i += 1
- continue
- if isinstance(args[i][2], basestring):
- res_ids = sheet_obj.name_search(cursor, user, args[i][2], [],
- args[i][1])
- args[i] = (args[i][0], 'in', [x[0] for x in res_ids])
- i += 1
- qu1, qu2 = [], []
- for x in args:
- if x[1] != 'in':
- if (x[2] is False) and (x[1] == '='):
- qu1.append('(s.id IS NULL)')
- elif (x[2] is False) and (x[1] == '<>' or x[1] == '!='):
- qu1.append('(s.id IS NOT NULL)')
- else:
- qu1.append('(s.id %s %s)' % (x[1], '%s'))
- qu2.append(x[2])
- elif x[1] == 'in':
- if len(x[2]) > 0:
- qu1.append('(s.id in (%s))' % (','.join(['%d'] * len(x[2]))))
- qu2 += x[2]
- else:
- qu1.append('(False)')
- if len(qu1):
- qu1 = ' WHERE ' + ' AND '.join(qu1)
- else:
- qu1 = ''
- cursor.execute('SELECT l.id \
- FROM hr_timesheet_sheet_sheet s \
- LEFT JOIN (hr_analytic_timesheet l \
- LEFT JOIN account_analytic_line al \
- ON (l.line_id = al.id)) \
- ON (s.date_to >= al.date \
- AND s.date_from <= al.date \
- AND s.user_id = al.user_id)' + \
- qu1, qu2)
- res = cursor.fetchall()
- if not len(res):
- return [('id', '=', '0')]
- return [('id', 'in', [x[0] for x in res])]
+ def _get_hr_timesheet_sheet(self, cr, uid, ids, context=None):
+ ts_line_ids = []
+ for ts in self.browse(cr, uid, ids, context=context):
+ cr.execute("""
+ SELECT l.id
+ FROM hr_analytic_timesheet l
+ INNER JOIN account_analytic_line al
+ ON (l.line_id = al.id)
+ WHERE %(date_to)s >= al.date
+ AND %(date_from)s <= al.date
+ AND %(user_id)s = al.user_id
+ GROUP BY l.id""", {'date_from': ts.date_from,
+ 'date_to': ts.date_to,
+ 'user_id': ts.employee_id.user_id.id,})
+ ts_line_ids.extend([row[0] for row in cr.fetchall()])
+ return ts_line_ids
+
+ def _get_account_analytic_line(self, cr, uid, ids, context=None):
+ ts_line_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [('line_id', 'in', ids)])
+ return ts_line_ids
_columns = {
- 'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+ 'sheet_id': fields.function(_sheet, string='Sheet',
type='many2one', relation='hr_timesheet_sheet.sheet',
- fnct_search=_sheet_search),
+ store={
+ 'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
+ 'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
+ 'hr.analytic.timesheet': (lambda self,cr,uid,ids,c={}: ids, ['line_id'], 10),
+ },
+ ),
}
_defaults = {
'date': _get_default_date,
}
- def create(self, cr, uid, vals, *args, **kwargs):
- if vals.get('sheet_id', False):
- ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
- if not ts.state in ('draft', 'new'):
- raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !'))
- return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
+ def _check_sheet_state(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ for timesheet_line in self.browse(cr, uid, ids, context=context):
+ if timesheet_line.sheet_id and timesheet_line.sheet_id.state not in ('draft', 'new'):
+ return False
+ return True
+
+ _constraints = [
+ (_check_sheet_state, 'You cannot modify an entry in a Confirmed/Done timesheet !.', ['state']),
+ ]
def unlink(self, cr, uid, ids, *args, **kwargs):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self._check(cr, uid, ids)
return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
- def write(self, cr, uid, ids, *args, **kwargs):
- self._check(cr, uid, ids)
- return super(hr_timesheet_line,self).write(cr, uid, ids,*args, **kwargs)
-
def _check(self, cr, uid, ids):
for att in self.browse(cr, uid, ids):
if att.sheet_id and att.sheet_id.state not in ('draft', 'new'):
return context['name'] + time.strftime(' %H:%M:%S')
return time.strftime('%Y-%m-%d %H:%M:%S')
+ def _get_hr_timesheet_sheet(self, cr, uid, ids, context=None):
+ attendance_ids = []
+ for ts in self.browse(cr, uid, ids, context=context):
+ cr.execute("""
+ SELECT a.id
+ FROM hr_attendance a
+ INNER JOIN hr_employee e
+ INNER JOIN resource_resource r
+ ON (e.resource_id = r.id)
+ ON (a.employee_id = e.id)
+ WHERE %(date_to)s >= date_trunc('day', a.name)
+ AND %(date_from)s <= a.name
+ AND %(user_id)s = r.user_id
+ GROUP BY a.id""", {'date_from': ts.date_from,
+ 'date_to': ts.date_to,
+ 'user_id': ts.employee_id.user_id.id,})
+ attendance_ids.extend([row[0] for row in cr.fetchall()])
+ return attendance_ids
+
def _sheet(self, cursor, user, ids, name, args, context=None):
sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
- cursor.execute("SELECT a.id, COALESCE(MAX(s.id), 0) \
- FROM hr_timesheet_sheet_sheet s \
- LEFT JOIN (hr_attendance a \
- LEFT JOIN hr_employee e \
- LEFT JOIN resource_resource r \
- ON (e.resource_id = r.id) \
- ON (a.employee_id = e.id)) \
- ON (s.date_to >= date_trunc('day',a.name) \
- AND s.date_from <= a.name \
- AND s.user_id = r.user_id) \
- WHERE a.id IN %s GROUP BY a.id",(tuple(ids),))
- res = dict(cursor.fetchall())
- sheet_names = {}
- for sheet_id, name in sheet_obj.name_get(cursor, user, res.values(),
- context=context):
- sheet_names[sheet_id] = name
- for line_id in {}.fromkeys(ids):
- sheet_id = res.get(line_id, False)
- if sheet_id:
- res[line_id] = (sheet_id, sheet_names[sheet_id])
- else:
- res[line_id] = False
+ res = dict.fromkeys(ids, False)
+ for attendance in self.browse(cursor, user, ids, context=context):
+ date_to = datetime.strftime(datetime.strptime(attendance.name[0:10], '%Y-%m-%d'), '%Y-%m-%d %H:%M:%S')
+ sheet_ids = sheet_obj.search(cursor, user,
+ [('date_to', '>=', date_to),
+ ('date_from', '<=', attendance.name),
+ ('employee_id', '=', attendance.employee_id.id)], context=context)
+ if sheet_ids:
+ # [0] because only one sheet possible for an employee between 2 dates
+ res[attendance.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
return res
- def _sheet_search(self, cursor, user, obj, name, args, context=None):
- if not len(args):
- return []
-
- sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
- i = 0
- while i < len(args):
- fargs = args[i][0].split('.', 1)
- if len(fargs) > 1:
- args[i] = (fargs[0], 'in', sheet_obj.search(cursor, user,
- [(fargs[1], args[i][1], args[i][2])], context=context))
- i += 1
- continue
- if isinstance(args[i][2], basestring):
- res_ids = sheet_obj.name_search(cursor, user, args[i][2], [],
- args[i][1])
- args[i] = (args[i][0], 'in', [x[0] for x in res_ids])
- i += 1
- qu1, qu2 = [], []
- for x in args:
- if x[1] != 'in':
- if (x[2] is False) and (x[1] == '='):
- qu1.append('(s.id IS NULL)')
- elif (x[2] is False) and (x[1] == '<>' or x[1] == '!='):
- qu1.append('(s.id IS NOT NULL)')
- else:
- qu1.append('(s.id %s %s)' % (x[1], '%s'))
- qu2.append(x[2])
- elif x[1] == 'in':
- if len(x[2]) > 0:
- qu1.append('(s.id in (%s))' % (','.join(['%d'] * len(x[2]))))
- qu2 += x[2]
- else:
- qu1.append('(False)')
- if len(qu1):
- qu1 = ' WHERE ' + ' AND '.join(qu1)
- else:
- qu1 = ''
- cursor.execute('SELECT a.id\
- FROM hr_timesheet_sheet_sheet s \
- LEFT JOIN (hr_attendance a \
- LEFT JOIN hr_employee e \
- ON (a.employee_id = e.id)) \
- LEFT JOIN resource_resource r \
- ON (e.resource_id = r.id) \
- ON (s.date_to >= date_trunc(\'day\',a.name) \
- AND s.date_from <= a.name \
- AND s.user_id = r.user_id) ' + \
- qu1, qu2)
- res = cursor.fetchall()
- if not len(res):
- return [('id', '=', '0')]
- return [('id', 'in', [x[0] for x in res])]
-
_columns = {
- 'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+ 'sheet_id': fields.function(_sheet, string='Sheet',
type='many2one', relation='hr_timesheet_sheet.sheet',
- fnct_search=_sheet_search),
+ store={
+ 'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
+ 'hr.attendance': (lambda self,cr,uid,ids,c={}: ids, ['employee_id', 'name', 'day'], 10),
+ },
+ )
}
_defaults = {
'name': _get_default_date,
if 'sheet_id' in context:
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
if ts.state not in ('draft', 'new'):
- raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
+ raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet!'))
res = super(hr_attendance,self).create(cr, uid, vals, context=context)
if 'sheet_id' in context:
if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
return res
def unlink(self, cr, uid, ids, *args, **kwargs):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self._check(cr, uid, ids)
return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
+ if isinstance(ids, (int, long)):
+ ids = [ids]
self._check(cr, uid, ids)
res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
if 'sheet_id' in context:
_auto = False
_order='name'
_columns = {
- 'name': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+ 'name': fields.many2one('account.analytic.account', 'Project / Analytic Account', readonly=True),
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True),
'total': fields.float('Total Time', digits=(16,2), readonly=True),
'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True),
_inherit = 'res.company'
_columns = {
'timesheet_range': fields.selection(
- [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
+ [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
+ help="Periodicity on which you validate your timesheets."),
'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
help="Allowed difference in hours between the sign in/out and the timesheet " \
"computation for one sheet. Set this to 0 if you do not want any control."),
projects / odoo / odoo.git / blobdiff