diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 464c3d295a4..f025addc61e 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -211,6 +211,7 @@ class one2many_mod2(fields.one2many): class hr_payslip_run(osv.osv): _name = 'hr.payslip.run' + _description = 'Payslip Run' _columns = { 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index a2523fcb7ba..b11ca79c5f5 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -663,8 +663,8 @@ search - - + + @@ -683,6 +683,7 @@ + diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py index 1ff19e01bb1..6eb0a6d1859 100644 --- a/addons/hr_payroll_account/hr_payroll_account.py +++ b/addons/hr_payroll_account/hr_payroll_account.py @@ -174,5 +174,14 @@ class hr_contract(osv.osv): } hr_contract() +class hr_payslip_run(osv.osv): + + _inherit = 'hr.payslip.run' + _description = 'Payslip Run' + _columns = { + 'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True), + } + +hr_payslip_run() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index 825fac9cab4..667b1308ec5 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -51,6 +51,46 @@ + + + + hr.payslip.run.search.inherit + hr.payslip.run + search + + + + + + + + + + + hr.payslip.run.tree.inherit + hr.payslip.run + tree + + + + + + + + + + hr.payslip.run.form.inherit + hr.payslip.run + form + + + + + + + + +