diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 5937bb7d67e..2f1dbe96007 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -228,7 +228,7 @@ class hr_payslip(osv.osv): 'note': fields.text('Description'), 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'details_by_salary_head': fields.function(_get_lines_salary_head, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'), - '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"), } _defaults = { 'date_from': lambda *a: time.strftime('%Y-%m-01'), @@ -248,7 +248,6 @@ class hr_payslip(osv.osv): 'line_ids': [], 'move_ids': [], 'move_line_ids': [], - 'move_payment_ids': [], 'company_id': company_id, 'period_id': False, 'basic_before_leaves': 0.0, diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 44fc0d595de..4e233e0d942 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 @@ -