From deb3b1161eb9aa2d7e25957001da82b696a65005 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Fri, 29 Jun 2012 11:11:18 +0530 Subject: [PATCH] [IMP]field added for calulating salary rule for DA,view for the same bzr revid: kbh@tinyerp.com-20120629054118-4mqwotwzexl4daky --- addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 9 +++++++++ .../l10n_in_hr_payroll_view.xml | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index bc87cf6110f..bf1c075cc62 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -245,4 +245,13 @@ class hr_payslip(osv.osv): hr_payslip() +class res_company(osv.osv): + + _inherit = 'res.company' + _columns = { + 'dearness_allowance': fields.boolean('Dearness Allowance') + } + +res_company() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index 83d9aae8968..28c3538d858 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -157,6 +157,23 @@ parent="hr_payroll.menu_hr_root_payroll" /> + + res.company.inherit + res.company + form + 20 + + + + + + + + + + + +