From dbafe29d94e8f22657dd5851749d877931e2f8fc Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 25 Jun 2012 11:41:20 +0200 Subject: [PATCH] [IMP] hr config settings: simplify code bzr revid: rco@openerp.com-20120625094120-rt7hbkmtlvyhunq1 --- addons/hr/res_config.py | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py index 57ddfabdbd3..c9e5b7a8628 100644 --- a/addons/hr/res_config.py +++ b/addons/hr/res_config.py @@ -31,7 +31,7 @@ class hr_config_settings(osv.osv_memory): 'module_hr_attendance': fields.boolean('Track Attendances', help ="""This installs the module hr_attendance."""), 'module_hr_timesheet': fields.boolean('Manage Timesheets', - help ="""This installs the module hr_timesheet."""), + help ="""This installs the module hr_timesheet."""), 'module_hr_holidays': fields.boolean('Leaves & Holidays', help ="""This installs the module hr_holidays."""), 'module_hr_expense': fields.boolean('Expenses', @@ -47,26 +47,15 @@ class hr_config_settings(osv.osv_memory): } def onchange_hr_timesheet(self, cr, uid, ids, timesheet, context=None): + """ module_hr_timesheet implies module_hr_attendance """ if timesheet: - vals = {'value': { - 'module_hr_timesheet': timesheet, - 'module_hr_attendance': timesheet, - }} - if timesheet == False: - vals = {'value': { - 'module_hr_timesheet': timesheet, - }} - return vals - + return {'value': {'module_hr_attendance': True}} + return {} + def onchange_hr_attendance(self, cr, uid, ids, attendance, context=None): - if attendance: - vals = {'value': { - 'module_hr_attendance': attendance, - }} - if attendance == False: - vals = {'value': { - 'module_hr_attendance': attendance, - 'module_hr_timesheet': attendance, - }} - return vals + """ module_hr_timesheet implies module_hr_attendance """ + if not attendance: + return {'value': {'module_hr_timesheet': False}} + return {} + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: