# -*- encoding: utf-8 -*- ############################################################################## # # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved. # # $Id$ # # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential # consequences resulting from its eventual inadequacies and bugs # End users who are looking for a ready-to-use solution with commercial # garantees and support are strongly adviced to contract a Free Software # Service Company # # This program is Free Software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################## import time from osv import fields from osv import osv import netsvc from mx import DateTime from tools.translate import _ class one2many_mod2(fields.one2many): def get(self, cr, obj, ids, name, user=None, offset=0, context={}, values={}): res = {} for id in ids: res[id] = [] res5 = obj.read(cr, user, ids, ['date_current', 'user_id'], context) res6 = {} for r in res5: res6[r['id']] = (r['date_current'], r['user_id'][0]) ids2 = [] for id in ids: dom = [] if id in res6: dom = [('name', '>=', res6[id][0] + ' 00:00:00'), ('name', '<=', res6[id][0] + ' 23:59:59'), ('employee_id.user_id', '=', res6[id][1])] ids2.extend(obj.pool.get(self._obj).search(cr, user, dom, limit=self._limit)) for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'): if r[self._fields_id]: res.setdefault(r[self._fields_id][0], []).append(r['id']) return res def set(self, cr, obj, id, field, values, user=None, context=None): if context is None: context = {} context = context.copy() context['sheet_id'] = id return super(one2many_mod2, self).set(cr, obj, id, field, values, user=user, context=context) class one2many_mod(fields.one2many): def get(self, cr, obj, ids, name, user=None, offset=0, context={}, values={}): res = {} for id in ids: res[id] = [] res5 = obj.read(cr, user, ids, ['date_current', 'user_id'], context) res6 = {} for r in res5: res6[r['id']] = (r['date_current'], r['user_id'][0]) ids2 = [] for id in ids: dom = [] if id in res6: dom = [('date', '=', res6[id][0]), ('user_id', '=', res6[id][1])] ids2.extend(obj.pool.get(self._obj).search(cr, user, dom, limit=self._limit)) for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'): if r[self._fields_id]: res.setdefault(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" def _total_day(self, cr, uid, ids, name, args, context): field_name = name.strip('_day') cr.execute('SELECT sheet.id, day.' + field_name +' \ 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 (' + ','.join([str(x) for x in ids]) + ')') return dict(cr.fetchall()) def _total(self, cr, uid, ids, name, args, context): cr.execute('SELECT s.id, COALESCE(SUM(d.' + name + '),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 ('+ ','.join(map(str, ids)) + ') \ GROUP BY s.id') return dict(cr.fetchall()) def _state_attendance(self, cr, uid, ids, name, args, context): result = {} link_emp = {} emp_ids = [] emp_obj = self.pool.get('hr.employee') for sheet in self.browse(cr, uid, ids, context): result[sheet.id] = 'none' emp_ids2 = emp_obj.search(cr, uid, [('user_id', '=', sheet.user_id.id)]) 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 def button_confirm(self, cr, uid, ids, context): for sheet in self.browse(cr, uid, ids, context): di = sheet.user_id.company_id.timesheet_max_difference if (abs(sheet.total_difference) < di) or not di: wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr) else: raise osv.except_osv(_('Warning !'), _('Please verify that the total difference of the sheet is lower than %.2f !') %(di,)) return True def date_today(self, cr, uid, ids, context): for sheet in self.browse(cr, uid, ids, context): if DateTime.now() <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}) elif DateTime.now() >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}) else: self.write(cr, uid, [sheet.id], {'date_current': time.strftime('%Y-%m-%d')}) return True def date_previous(self, cr, uid, ids, context): for sheet in self.browse(cr, uid, ids, context): if DateTime.strptime(sheet.date_current, '%Y-%m-%d') <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}) else: self.write(cr, uid, [sheet.id], { 'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=-1)).strftime('%Y-%m-%d'), }) return True def date_next(self, cr, uid, ids, context): for sheet in self.browse(cr, uid, ids, context): if DateTime.strptime(sheet.date_current, '%Y-%m-%d') >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}) else: self.write(cr, uid, [sheet.id], { 'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'), }) return True def button_dummy(self, cr, uid, ids, context): for sheet in self.browse(cr, uid, ids, context): if DateTime.strptime(sheet.date_current, '%Y-%m-%d') <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}) elif DateTime.strptime(sheet.date_current, '%Y-%m-%d') >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'): self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}) return True def sign_in(self, cr, uid, ids, context): if not self.browse(cr, uid, ids, context)[0].date_current == time.strftime('%Y-%m-%d'): raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today')) emp_obj = self.pool.get('hr.employee') emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) context['sheet_id']=ids[0] success = emp_obj.sign_in(cr, uid, emp_id, context=context) return True def sign_out(self, cr, uid, ids, context): if not self.browse(cr, uid, ids, 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_obj = self.pool.get('hr.employee') emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) context['sheet_id']=ids[0] success = emp_obj.sign_out(cr, uid, emp_id, context=context) return True _columns = { 'name': fields.char('Description', size=64, select=1), 'user_id': fields.many2one('res.users', 'User', required=True, select=1), '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), '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, states={'draft':[('readonly',False)],'new':[('readonly',False)]}), 'state' : fields.selection([('new', 'New'),('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'Status', select=True, required=True, readonly=True), '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'), 'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet'), 'total_difference_day': fields.function(_total_day, method=True, string='Difference'), 'total_attendance': fields.function(_total, method=True, string='Total Attendance'), 'total_timesheet': fields.function(_total, method=True, string='Total Timesheet'), 'total_difference': fields.function(_total, method=True, string='Difference'), '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), } def _default_date_from(self,cr, uid, context={}): user = self.pool.get('res.users').browse(cr, uid, uid, context) r = user.company_id and user.company_id.timesheet_range or 'month' if r=='month': return time.strftime('%Y-%m-01') elif r=='week': return (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d') elif r=='year': return time.strftime('%Y-01-01') return time.strftime('%Y-%m-%d') def _default_date_to(self,cr, uid, context={}): user = self.pool.get('res.users').browse(cr, uid, uid, context) r = user.company_id and user.company_id.timesheet_range or 'month' if r=='month': return (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d') elif r=='week': return (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d') elif r=='year': return time.strftime('%Y-12-31') return time.strftime('%Y-%m-%d') _defaults = { 'user_id': lambda self,cr,uid,c: uid, 'date_from' : _default_date_from, 'date_current' : lambda *a: time.strftime('%Y-%m-%d'), 'date_to' : _default_date_to, 'state': lambda *a: 'new', } def _sheet_date(self, cr, uid, ids): for sheet in self.browse(cr, uid, ids): cr.execute('SELECT id \ FROM hr_timesheet_sheet_sheet \ WHERE (date_from < %s and %s < date_to) \ AND user_id=%d \ AND id <> %d', (sheet.date_to, sheet.date_from, sheet.user_id.id, sheet.id)) if cr.fetchall(): return False return True def _date_current_check(self, cr, uid, ids): for sheet in self.browse(cr, uid, ids): if sheet.date_current < sheet.date_from or sheet.date_current > sheet.date_to: return False return True _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']), (_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']), ] def action_set_to_draft(self, cr, uid, ids, *args): self.write(cr, uid, ids, {'state': 'draft'}) wf_service = netsvc.LocalService('workflow') for id in ids: wf_service.trg_create(uid, self._name, id, cr) return True def name_get(self, cr, uid, ids, context={}): if not len(ids): return [] return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \ for r in self.read(cr, uid, ids, ['date_from', 'date_to'], context, load='_classic_write')] hr_timesheet_sheet() class hr_timesheet_line(osv.osv): _inherit = "hr.analytic.timesheet" def _get_default_date(self, cr, uid, context={}): if 'date' in context: return context['date'] return time.strftime('%Y-%m-%d') def _sheet(self, cursor, user, ids, name, args, context): 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 (' + ','.join([str(x) for x in ids]) + ') \ GROUP BY l.id') 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 return res def _sheet_search(self, cursor, user, obj, name, args): 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])])) 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], '%d')) 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])] _columns = { 'sheet_id': fields.function(_sheet, method=True, string='Sheet', type='many2one', relation='hr_timesheet_sheet.sheet', fnct_search=_sheet_search), } _defaults = { 'date': _get_default_date, } def create(self, cr, uid, vals, *args, **kwargs): if 'sheet_id' in vals: 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 unlink(self, cr, uid, ids, *args, **kwargs): 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'): raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !')) return True hr_timesheet_line() class hr_attendance(osv.osv): _inherit = "hr.attendance" def _get_default_date(self, cr, uid, context={}): if 'name' in context: return context['name'] + time.strftime(' %H:%M:%S') return time.strftime('%Y-%m-%d %H:%M:%S') def _sheet(self, cursor, user, ids, name, args, context): 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 \ ON (a.employee_id = e.id)) \ ON (s.date_to >= a.name \ AND s.date_from <= a.name \ AND s.user_id = e.user_id) \ WHERE a.id in (' + ','.join([str(x) for x in ids]) + ') \ GROUP BY a.id') 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 return res def _sheet_search(self, cursor, user, obj, name, args): 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])])) 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], '%d')) 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)) \ ON (s.date_to >= a.name \ AND s.date_from <= a.name \ AND s.user_id = e.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', type='many2one', relation='hr_timesheet_sheet.sheet', fnct_search=_sheet_search), } _defaults = { 'name': _get_default_date, } def create(self, cr, uid, vals, context={}): if 'sheet_id' in context: ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id']) if ts.state not in ('draft', 'new'): raise osv.except_osv(_('Error !'), _('You can not 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: raise osv.except_osv(_('UserError'), _('You can not enter an attendance ' \ 'date outside the current timesheet dates!')) return res def unlink(self, cr, uid, ids, *args, **kwargs): self._check(cr, uid, ids) return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs) def write(self, cr, uid, ids, vals, context={}): self._check(cr, uid, ids) res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context) if 'sheet_id' in context: for attendance in self.browse(cr, uid, ids, context=context): if context['sheet_id'] != attendance.sheet_id.id: raise osv.except_osv(_('UserError'), _('You can not enter an attendance ' \ 'date outside the current timesheet dates!')) return res 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'): raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !')) return True hr_attendance() class hr_timesheet_sheet_sheet_day(osv.osv): _name = "hr_timesheet_sheet.sheet.day" _description = "Timesheets by period" _auto = False _order='name' _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_attendance': fields.float('Attendance', readonly=True), 'total_difference': fields.float('Difference', readonly=True), } def init(self, cr): cr.execute("""create or replace view hr_timesheet_sheet_sheet_day as SELECT id, name, sheet_id, total_timesheet, total_attendance, (total_attendance - total_timesheet) AS total_difference FROM (( SELECT MAX(id) as id, name, sheet_id, SUM(total_timesheet) as total_timesheet, CASE WHEN SUM(total_attendance) < 0 THEN (SUM(total_attendance) + CASE WHEN current_date <> name THEN 1440 ELSE (EXTRACT(hour FROM current_time) * 60) + EXTRACT(minute FROM current_time) END ) ELSE SUM(total_attendance) END /60 as total_attendance FROM (( select min(hrt.id) as id, l.date::date as name, s.id as sheet_id, sum(l.unit_amount) as total_timesheet, 0.0 as total_attendance from hr_analytic_timesheet hrt left join (account_analytic_line l LEFT JOIN hr_timesheet_sheet_sheet s ON (s.date_to >= l.date AND s.date_from <= l.date AND s.user_id = l.user_id)) on (l.id = hrt.line_id) group by l.date::date, s.id ) union ( select -min(a.id) as id, a.name::date as name, s.id as sheet_id, 0.0 as total_timesheet, SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance from hr_attendance a LEFT JOIN (hr_timesheet_sheet_sheet s LEFT JOIN hr_employee e ON (s.user_id = e.user_id)) ON (a.employee_id = e.id AND s.date_to >= a.name AND s.date_from <= a.name) WHERE action in ('sign_in', 'sign_out') group by a.name::date, s.id )) AS foo GROUP BY name, sheet_id )) AS bar""") hr_timesheet_sheet_sheet_day() class hr_timesheet_sheet_sheet_account(osv.osv): _name = "hr_timesheet_sheet.sheet.account" _description = "Timesheets by period" _auto = False _order='name' _columns = { 'name': fields.many2one('account.analytic.account', '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), } def init(self, cr): cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as ( select min(hrt.id) as id, l.account_id as name, s.id as sheet_id, sum(l.unit_amount) as total, l.to_invoice as invoice_rate from hr_analytic_timesheet hrt left join (account_analytic_line l LEFT JOIN hr_timesheet_sheet_sheet s ON (s.date_to >= l.date AND s.date_from <= l.date AND s.user_id = l.user_id)) on (l.id = hrt.line_id) group by l.account_id, s.id, l.to_invoice )""") hr_timesheet_sheet_sheet_account() class res_company(osv.osv): _inherit = 'res.company' _columns = { 'timesheet_range': fields.selection( [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timeshet range', required=True), 'timesheet_max_difference': fields.float('Timesheet allowed difference', help="Allowed difference between the sign in/out and the timesheet " \ "computation for one sheet. Set this to 0 if you do not want any control."), } _defaults = { 'timesheet_range': lambda *args: 'month', 'timesheet_max_difference': lambda *args: 0.0 } res_company() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: