From 533ea71235e5b2c2e3060760830766371661c885 Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 3 Mar 2011 15:57:45 +0530 Subject: [PATCH] [IMP] hr_payroll:removed all fields from 'hr.holidays.status',except the 'code' field. bzr revid: mtr@mtr-20110303102745-uds7mbwabpjs372w --- addons/hr_payroll/hr_payroll.py | 16 +--------------- addons/hr_payroll/hr_payroll_view.xml | 3 --- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 080b6cc6d0c..2bb32145600 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -596,21 +596,7 @@ class hr_holidays_status(osv.osv): _inherit = "hr.holidays.status" _columns = { - 'company_id':fields.many2one('res.company', 'Company', required=False), - 'type':fields.selection([ - ('paid','Paid Holiday'), - ('unpaid','Un-Paid Holiday'), - ('halfpaid','Half-Pay Holiday') - ], string='Payment'), - 'head_id': fields.many2one('hr.salary.head', 'Payroll Head', domain=[('type','=','deduction')]), -# 'code': fields.related('head_id','code', type='char', relation='hr.salary.head', string='Code'), - 'code':fields.char('Code', size=64, required=False, readonly=False), - } - _defaults = { - 'type': lambda *args: 'unpaid', - 'company_id': lambda self, cr, uid, context: \ - self.pool.get('res.users').browse(cr, uid, uid, - context=context).company_id.id, + 'code':fields.char('Code', size=64, required=False, readonly=False, help="It is used to define the code for Leave Type which will then be used in Salary Rules."), } hr_holidays_status() diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 142bb71676c..326fa6c06b6 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -252,9 +252,6 @@ -