diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index a0830eb6b58..6725b284383 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'), } @@ -268,7 +268,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 5fec6c76763..9449523929b 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 @@ -