[IMP] [Leaves] Context problem: creating a leave from the employee form.
bzr revid: tta@openerp.com-20130211105701-gzl5vsmx01ckdled
This commit is contained in:
parent
6e22d502b9
commit
026e53d27a
|
@ -117,7 +117,10 @@ class hr_holidays(osv.osv):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
def _employee_get(self, cr, uid, context=None):
|
def _employee_get(self, cr, uid, context=None):
|
||||||
|
emp_id = context.get('default_employee_id', False)
|
||||||
|
if emp_id:
|
||||||
|
return emp_id
|
||||||
ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
|
ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
|
||||||
if ids:
|
if ids:
|
||||||
return ids[0]
|
return ids[0]
|
||||||
|
@ -204,9 +207,9 @@ class hr_holidays(osv.osv):
|
||||||
leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
|
leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
|
||||||
return obj_res_leave.unlink(cr, uid, leave_ids, context=context)
|
return obj_res_leave.unlink(cr, uid, leave_ids, context=context)
|
||||||
|
|
||||||
def onchange_type(self, cr, uid, ids, holiday_type):
|
def onchange_type(self, cr, uid, ids, holiday_type, employee_id):
|
||||||
result = {'value': {'employee_id': False}}
|
result = {}
|
||||||
if holiday_type == 'employee':
|
if holiday_type == 'employee' and not employee_id:
|
||||||
ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
|
ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
|
||||||
if ids_employee:
|
if ids_employee:
|
||||||
result['value'] = {
|
result['value'] = {
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
|
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
|
<field name="holiday_type" on_change="onchange_type(holiday_type, employee_id)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
|
||||||
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
|
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
|
||||||
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
|
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
Loading…
Reference in New Issue