From 64216c35784cdf668e0050e3d296a32404eb6851 Mon Sep 17 00:00:00 2001 From: pinky <> Date: Mon, 5 Mar 2007 18:22:32 +0000 Subject: [PATCH] Added timesheet improved bzr revid: pinky-fcc0eb67412745596f7b8f758f83ebab4ae4b52f --- addons/hr_timesheet_sheet/__init__.py | 2 + addons/hr_timesheet_sheet/__terp__.py | 14 + .../hr_timesheet_sheet/hr_timesheet_sheet.py | 264 ++++++++++++++++++ .../hr_timesheet_sheet_view.xml | 165 +++++++++++ .../hr_timesheet_workflow.xml | 63 +++++ addons/hr_timesheet_sheet/wizard/__init__.py | 30 ++ .../wizard/wizard_timesheet_current.py | 72 +++++ 7 files changed, 610 insertions(+) create mode 100644 addons/hr_timesheet_sheet/__init__.py create mode 100644 addons/hr_timesheet_sheet/__terp__.py create mode 100644 addons/hr_timesheet_sheet/hr_timesheet_sheet.py create mode 100644 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml create mode 100644 addons/hr_timesheet_sheet/hr_timesheet_workflow.xml create mode 100644 addons/hr_timesheet_sheet/wizard/__init__.py create mode 100644 addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py diff --git a/addons/hr_timesheet_sheet/__init__.py b/addons/hr_timesheet_sheet/__init__.py new file mode 100644 index 00000000000..4b5cf90a314 --- /dev/null +++ b/addons/hr_timesheet_sheet/__init__.py @@ -0,0 +1,2 @@ +import hr_timesheet_sheet +import wizard diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py new file mode 100644 index 00000000000..ae3f0c808ae --- /dev/null +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -0,0 +1,14 @@ +{ + "name" : "Human Resources (Timesheet groups)", + "version" : "0.1", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", + "website" : "http://tinyerp.com/module_hr.html", + "description": "Timesheet by sheets", + "depends" : ["hr_timesheet", "hr_timesheet_project"], + "init_xml" : [], + "demo_xml" : [], + "update_xml" : ["hr_timesheet_sheet_view.xml", "hr_timesheet_workflow.xml"], + "active": False, + "installable": True +} diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py new file mode 100644 index 00000000000..0c83379a944 --- /dev/null +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -0,0 +1,264 @@ +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id: hr_timesheet.py 5490 2007-01-29 16:05:51Z pinky $ +# +# 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 + +from mx import DateTime + + +class hr_timesheet_sheet(osv.osv): + _name = "hr_timesheet_sheet.sheet" + _table = 'hr_timesheet_sheet_sheet' + _order = "id desc" + def _total_attendance_day(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)]) + if ids: + result[day.id] = obj.read(cr, uid, ids, ['total_attendance'])[0]['total_attendance'] or 0.0 + return result + + def _total_timesheet_day(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)]) + if ids: + result[day.id] = obj.read(cr, uid, ids, ['total_timesheet'])[0]['total_timesheet'] or 0.0 + return result + + def _total_difference_day(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)]) + if ids: + result[day.id] = obj.read(cr, uid, ids, ['total_difference'])[0]['total_difference'] or 0.0 + return result + + def _total_attendance(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id)]) + for o in obj.browse(cr, uid, ids, context): + result[day.id] += o.total_attendance + return result + + def _total_timesheet(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id)]) + for o in obj.browse(cr, uid, ids, context): + result[day.id] += o.total_timesheet + return result + + def _total_difference(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = 0.0 + obj = self.pool.get('hr_timesheet_sheet.sheet.day') + ids = obj.search(cr, uid, [('sheet_id','=',day.id)]) + for o in obj.browse(cr, uid, ids, context): + result[day.id] += o.total_difference + return result + + def date_previous(self, cr, uid, ids, context): + for sheet in self.browse(cr, uid, ids, context): + 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): + 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 sign_in(self, cr, uid, ids, context): + emp_obj = self.pool.get('hr.employee') + emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) + success = emp_obj.sign_in(cr, uid, emp_id) + self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]}) + return True + + def sign_out(self, cr, uid, ids, context): + emp_obj = self.pool.get('hr.employee') + emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) + success = emp_obj.sign_out(cr, uid, emp_id) + self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]}) + 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), + 'date_to': fields.date('Date to', required=True, select=1), + 'date_current': fields.date('Current date', required=True), + 'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'sheet_id', 'Timesheets', domain=[('date','=',time.strftime('%Y-%m-%d'))], readonly=True, states={'draft':[('readonly',False)]}), + 'attendances_ids' : fields.one2many('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)]}), + 'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'state', select=True, required=True, readonly=True), + 'total_attendance_day': fields.function(_total_attendance_day, method=True, string='Total Attendance'), + 'total_timesheet_day': fields.function(_total_timesheet_day, method=True, string='Total Timesheet'), + 'total_difference_day': fields.function(_total_difference_day, method=True, string='Difference'), + 'total_attendance': fields.function(_total_attendance, method=True, string='Total Attendance'), + 'total_timesheet': fields.function(_total_timesheet, method=True, string='Total Timesheet'), + 'total_difference': fields.function(_total_difference, method=True, string='Difference'), + 'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True), + } + _defaults = { + 'user_id': lambda self,cr,uid,c: uid, + 'date_from' : lambda *a:time.strftime('%Y-%m-01'), + 'date_current' : lambda *a:time.strftime('%Y-%m-%d'), + 'date_to' : lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d'), + 'state': lambda *a: 'draft' + } +hr_timesheet_sheet() + +class hr_timesheet_line(osv.osv): + _inherit = "account.analytic.line" + _columns = { + 'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null') + } + _default = { + 'sheet_id': lambda *a: False + } + 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 ts.state<>'draft': + 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): + print '2', 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): + print att.sheet_id + if att.sheet_id and att.sheet_id.state<>'draft': + 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" + _columns = { + 'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null') + } + _default = { + 'sheet_id': lambda *a: False + } + 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 ts.state<>'draft': + raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !') + return super(hr_attendance,self).create(cr, uid, vals, *args, **kwargs) + 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, *args, **kwargs): + print '1' + self._check(cr, uid, ids) + return super(hr_attendance,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<>'draft': + 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 + def _total_difference(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + result[day.id] = day.total_attendance-day.total_timesheet + return result + + def _total_attendance(self, cr, uid, ids, name, args, context): + result = {} + for day in self.browse(cr, uid, ids, context): + cr.execute('select name,action from hr_attendance where name>=%s and name<=%s order by name', (day.name, day.name+' 23:59:59')) + attendences = cr.dictfetchall() + wh = 0 + if attendences and attendences[0]['action'] == 'sign_out': + attendences.insert(0, {'name': day.name+' 00:00:00', 'action':'sign_in'}) + if attendences and attendences[-1]['action'] == 'sign_in': + attendences.append({'name': day.name+' 23:59:59', 'action':'sign_out'}) + for att in attendences: + dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S') + if att['action'] == 'sign_out': + wh += (dt - ldt).hours + ldt = dt + result[day.id] = wh + print result + return result + _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.function(_total_attendance, method=True, string='Attendance', readonly=True), + 'total_difference': fields.function(_total_difference, method=True, string='Difference', readonly=True), + } + def init(self, cr): + cr.execute(""" + create or replace view hr_timesheet_sheet_sheet_day as ( + select + min(case when l.oid is not null then l.oid else a.oid end) as id, + min(case when l.date is not null then l.date else a.name::date end) as name, + (case when l.sheet_id is not null then l.sheet_id else a.sheet_id end) as sheet_id, + sum(l.unit_amount) as total_timesheet + from + account_analytic_line l + full outer join + hr_attendance a on ((a.name::date=l.date) and l.sheet_id=a.sheet_id) + group by l.date,a.name::date, l.sheet_id,a.sheet_id + )""") +hr_timesheet_sheet_sheet_day() + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml new file mode 100644 index 00000000000..1b30058771c --- /dev/null +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -0,0 +1,165 @@ + + + + + hr.timesheet.sheet.tree + hr_timesheet_sheet.sheet + tree + + + + + + + + + + + + + + + + hr.timesheet.sheet.form + hr_timesheet_sheet.sheet + form + +
+ + + + + + + + + +