import time
from datetime import datetime
-from dateutil.relativedelta import relativedelta
+from dateutil.relativedelta import relativedelta, MO
from osv import fields, osv
from tools.translate import _
self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
return True
- def sign_in(self, cr, uid, ids, context=None):
+ def sign(self, cr, uid, ids, typ, context=None):
emp_obj = self.pool.get('hr.employee')
+ sheet = self.browse(cr, uid, ids, context=context)[0]
if context is None:
context = {}
- if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
+ 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_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+ emp_id = sheet.employee_id.id
context['sheet_id']=ids[0]
- emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,)
+ emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)
return True
+ def sign_in(self, cr, uid, ids, context=None):
+ return self.sign(cr,uid,ids,'sign_in',context=None)
+
def sign_out(self, cr, uid, ids, context=None):
- emp_obj = self.pool.get('hr.employee')
- if context is None:
- context = {}
- if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
- raise osv.except_osv(_('Error !'), _('You can not sign out from an other date than today'))
- emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)])
- context['sheet_id']=ids[0]
- emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,)
- return True
+ return self.sign(cr,uid,ids,'sign_out',context=None)
_columns = {
'name': fields.char('Description', size=64, select=1,
'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={
if r=='month':
return time.strftime('%Y-%m-01')
elif r=='week':
- return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
+ return (datetime.today() + relativedelta(weekday=MO(-1))).strftime('%Y-%m-%d')
elif r=='year':
return time.strftime('%Y-01-01')
return time.strftime('%Y-%m-%d')
_columns = {
'name': fields.date('Date', readonly=True),
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True, select="1"),
- 'total_timesheet': fields.float('Project Timesheet', readonly=True),
+ 'total_timesheet': fields.float('Total Timesheet', readonly=True),
'total_attendance': fields.float('Attendance', readonly=True),
'total_difference': fields.float('Difference', readonly=True),
}