[IMP] hr_payroll:removed all fields from 'hr.holidays.status',except the 'code' field.

bzr revid: mtr@mtr-20110303102745-uds7mbwabpjs372w

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 080b6cc..2bb3214 100644 (file)
--- 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 142bb71..326fa6c 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -252,9 +252,6 @@
                   </group>
                 <group colspan="2">
                     <separator colspan="2" string="Payroll Configurtion"/><newline/>
-                    <!--<field name="type"/><newline/>
-                    <field name="head_id"/><newline/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>-->
                     <field name="code" />
                 </group>
             </xpath>