_description = "Employee Category"
_columns = {
'name': fields.char("Category", size=64, required=True),
- 'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
+ 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
}
hr_employee_category()
-class hr_employee_marital_status(osv.osv):
- _name = "hr.employee.marital.status"
- _description = "Employee Marital Status"
- _columns = {
- 'name': fields.char('Marital Status', size=32, required=True, translate=True),
- 'description': fields.text('Status Description'),
- }
-
-hr_employee_marital_status()
-
class hr_job(osv.osv):
def _no_of_employee(self, cr, uid, ids, name, args, context=None):
_description = "Job Description"
_columns = {
'name': fields.char('Job Name', size=128, required=True, select=True),
- 'expected_employees': fields.function(_no_of_employee, method=True, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee"),
- 'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee"),
+ 'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee", store=True),
+ 'no_of_employee': fields.function(_no_of_employee, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee", store=True),
'no_of_recruitment': fields.float('Expected in Recruitment'),
'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
'description': fields.text('Job Description'),
'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
'sinid': fields.char('SIN No', size=32, help="Social Insurance Number"),
'identification_id': fields.char('Identification No', size=32),
+ 'otherid': fields.char('Other Id', size=64),
'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
- 'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
+ 'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
'department_id':fields.many2one('hr.department', 'Department'),
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
- 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
+ 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
'work_phone': fields.char('Work Phone', size=32, readonly=False),
- 'mobile_phone': fields.char('Mobile', size=32, readonly=False),
+ 'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
'work_email': fields.char('Work E-mail', size=240),
'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'),
- 'parent_id': fields.many2one('hr.employee', 'Manager'),
- 'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
+ 'parent_id': fields.many2one('hr.employee', 'Manager'),
+ 'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Categories'),
'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
'coach_id': fields.many2one('hr.employee', 'Coach'),
'passport_id':fields.char('Passport No', size=64)
}
+ def unlink(self, cr, uid, ids, context=None):
+ resource_obj = self.pool.get('resource.resource')
+ resource_ids = []
+ for employee in self.browse(cr, uid, ids, context=context):
+ resource = employee.resource_id
+ if resource:
+ resource_ids.append(resource.id)
+ if resource_ids:
+ resource_obj.unlink(cr, uid, resource_ids, context=context)
+ return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+
def onchange_address_id(self, cr, uid, ids, address, context=None):
if address:
address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
- return {'value': {'work_email': address.email, 'work_phone': address.phone}}
+ return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
return {'value': {}}
def onchange_company(self, cr, uid, ids, company, context=None):
_defaults = {
'active': 1,
'photo': _get_photo,
- 'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
}
def _check_recursion(self, cr, uid, ids, context=None):
def create(self, cr, uid, data, context=None):
user_id = super(res_users, self).create(cr, uid, data, context=context)
- data_obj = self.pool.get('ir.model.data')
- try:
- data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
- view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
- self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
- 'user_id': user_id}, context=context)
- except:
- # Tolerate a missing shortcut. See product/product.py for similar code.
- logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-
+
+ # add shortcut unless 'noshortcut' is True in context
+ if not(context and context.get('noshortcut', False)):
+ data_obj = self.pool.get('ir.model.data')
+ try:
+ data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
+ view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+ self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+ 'user_id': user_id}, context=context)
+ except:
+ # Tolerate a missing shortcut. See product/product.py for similar code.
+ logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+
return user_id
res_users()
projects / odoo / odoo.git / blobdiff