pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_holidays: passed context as an argument in all the methods()

Browse Source 
bzr revid: mtr@mtr-20110705071151-lhg6wqbphg9hoysw
This commit is contained in:
mtr
2011-07-05 12:41:51 +05:30
parent 2f948381cc
commit d93d0aa0fa
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/hr_holidays.py
+21 -18
View File
@@ -161,7 +161,7 @@ class hr_holidays(osv.osv):
leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
return obj_res_leave.unlink(cr, uid, leave_ids)
def onchange_type(self, cr, uid, ids, holiday_type):
def onchange_type(self, cr, uid, ids, holiday_type, context=None):
result = {'value': {'employee_id': False}}
if holiday_type == 'employee':
ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
@@ -172,7 +172,7 @@ class hr_holidays(osv.osv):
return result
# TODO: can be improved using resource calendar method
def _get_number_of_days(self, date_from, date_to):
def _get_number_of_days(self, date_from, date_to, context=None):
"""Returns a float equals to the timedelta between two dates given as string."""
DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -188,10 +188,12 @@ class hr_holidays(osv.osv):
raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
return super(hr_holidays, self).unlink(cr, uid, ids, context)
def onchange_date_from(self, cr, uid, ids, date_to, date_from):
def onchange_date_from(self, cr, uid, ids, date_to, date_from, context=None):
result = {}
if context is None:
context = {}
if date_to and date_from:
diff_day = self._get_number_of_days(date_from, date_to)
diff_day = self._get_number_of_days(date_from, date_to, context=context)
result['value'] = {
'number_of_days_temp': round(diff_day)+1
}
@@ -212,7 +214,7 @@ class hr_holidays(osv.osv):
}
return {'warning': warning}
def set_to_draft(self, cr, uid, ids, *args):
def set_to_draft(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {
'state': 'draft',
'manager_id': False,
@@ -223,20 +225,18 @@ class hr_holidays(osv.osv):
wf_service.trg_create(uid, 'hr.holidays', id, cr)
return True
def get_user_lang(self, cr, uid, ids):
lang = self.pool.get('res.users').browse(cr, uid, uid).context_lang
return {'lang': lang}
def holidays_validate(self, cr, uid, ids, *args):
context = self.get_user_lang(cr, uid, ids)
def holidays_validate(self, cr, uid, ids, context=None):
if context is None:
context = {}
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
def holidays_validate2(self, cr, uid, ids, *args):
context = self.get_user_lang(cr, uid, ids)
def holidays_validate2(self, cr, uid, ids, context=None):
if context is None:
context = {}
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
@@ -282,20 +282,23 @@ class hr_holidays(osv.osv):
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
return True
def holidays_confirm(self, cr, uid, ids, *args):
context = self.get_user_lang(cr, uid, ids)
def holidays_confirm(self, cr, uid, ids, context=None):
if context is None:
context = {}
self.check_holidays(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})
def holidays_refuse(self, cr, uid, ids, *args):
def holidays_refuse(self, cr, uid, ids, context=None):
if context is None:
context = {}
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
self.holidays_cancel(cr, uid, ids)
self.holidays_cancel(cr, uid, ids, context=context)
return True
def holidays_cancel(self, cr, uid, ids, *args):
def holidays_cancel(self, cr, uid, ids, context=None):
obj_crm_meeting = self.pool.get('crm.meeting')
for record in self.browse(cr, uid, ids):
# Delete the meeting
addons/hr_holidays/hr_holidays_view.xml
+6 -6
View File
@@ -71,7 +71,7 @@
<form string="Leave Request">
<group col="8" colspan="4">
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
<field name="holiday_type" on_change="onchange_type(holiday_type, context)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
</group>
@@ -83,8 +83,8 @@
<page string="General">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" />
<field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_from" on_change="onchange_date_from(date_to, date_from, context)" required="1"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from, context)" required="1"/>
<field name="number_of_days_temp"/>
<newline/>
<field name="manager_id"/>
@@ -115,7 +115,7 @@
<form string="Allocation Request">
<group col="8" colspan="4">
<field name="name" />
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager"/>
<field name="holiday_type" on_change="onchange_type(holiday_type, context)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager"/>
<group attrs="{'invisible':[('holiday_type','=','category')]}">
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
</group>
@@ -181,8 +181,8 @@
<field name="name" />
<field name="holiday_status_id" />
<field name="type"/>
<field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="date_from" on_change="onchange_date_from(date_to, date_from, context)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from, context)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="number_of_days_temp"/>
<notebook colspan="4">
<page string="General">