diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 4063b327545..d6477640582 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -28,11 +28,9 @@ "website" : "http://www.openerp.com", "description": """ Module for human resource management. You can manage: - * Employees and hierarchies - * Work hours sheets - * Attendances and sign in/out system - - Different reports are also provided, mainly for attendance statistics. + * Employees and hierarchies : You can define your employee with User and display hierarchies + * HR Departments + * HR Jobs """, 'author': 'Tiny', 'website': 'http://www.openerp.com', @@ -47,7 +45,7 @@ 'hr_installer.xml', 'hr_data.xml' ], - 'demo_xml': ['hr_demo.xml', + 'demo_xml': ['hr_demo.xml', 'hr_department_demo.xml'], 'installable': True, 'active': False, diff --git a/addons/hr/hr.py b/addons/hr/hr.py index d2b4d2ec011..bdaca6e2ace 100755 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## - from osv import fields, osv from tools.translate import _ @@ -82,6 +81,7 @@ class hr_job(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c), 'state': lambda *args: 'open' } + hr_job() class hr_employee(osv.osv): @@ -104,7 +104,6 @@ class hr_employee(osv.osv): 'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True), 'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True), 'work_location': fields.char('Office Location', size=32), - 'notes': fields.text('Notes'), 'parent_id': fields.many2one('hr.employee', 'Manager', select=True), 'category_id' : fields.many2one('hr.employee.category', 'Category'), @@ -112,7 +111,6 @@ class hr_employee(osv.osv): 'resource_id': fields.many2one('resource.resource','Resource',ondelete='cascade'), 'coach_id':fields.many2one('res.users','Coach'), 'job_id':fields.many2one('hr.job', 'Job'), - } _defaults = { 'active' : lambda *a: True, @@ -134,5 +132,4 @@ class hr_employee(osv.osv): hr_employee() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml index c7ea68f1dc3..bc1649bbef5 100644 --- a/addons/hr/hr_department_demo.xml +++ b/addons/hr/hr_department_demo.xml @@ -1,63 +1,61 @@ - + Management + Administration - + Technical department - + IT - + Marketing - + Sales - + Sales Europe - + Sales America - - - - + diff --git a/addons/hr/installer.py b/addons/hr/installer.py index ab3e46c9bbf..bc3dd7d0b71 100644 --- a/addons/hr/installer.py +++ b/addons/hr/installer.py @@ -52,4 +52,7 @@ class hr_installer(osv.osv_memory): 'hr_holidays': True, 'hr_expense': True, } + hr_installer() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file