From 7080f2b5f34d29016442b16237989c925fca3477 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 11 Apr 2011 14:10:46 +0200 Subject: [PATCH] [IMP] hr_payroll: refund payslip feature improved bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl --- addons/hr_payroll/hr_payroll.py | 2 +- addons/hr_payroll/hr_payroll_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index bc2136d..6725b28 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -246,7 +246,7 @@ class hr_payslip(osv.osv): 'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'note': fields.text('Description'), 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), - 'credit_note': fields.boolean('Credit Note', help="It indicates that the payslip has been refunded", readonly=True), + 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"), #TODO put me back # 'details_by_salary_head': fields.function(_get_salary_rules, method=True, type='one2many', relation='hr.salary.rule', string='Details by Salary Head', multi='details_by_salary_head'), } diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 5fec6c7..9449523 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -196,6 +196,7 @@ + @@ -273,7 +274,6 @@ -