diff --git a/payroll.py b/payroll.py index 02aa779..74d2906 100644 --- a/payroll.py +++ b/payroll.py @@ -1725,11 +1725,11 @@ class PayrollByPeriodDynamic(Period): 'Payroll By Period Dynamic' __name__ = 'staff_payroll_co.payroll_by_period_dynamic' payrolls = fields.Function(fields.One2Many('staff.payroll', None, - 'Payrolls'), 'get_payrolls') + 'Payrolls'), 'get_payrolls') amount_net_payment = fields.Function(fields.Numeric('Amount Net Payment', - digits=(16, 2)), 'get_amount') + digits=(16, 2)), 'get_amount') amount_total_cost = fields.Function(fields.Numeric('Amount Total Cost', - digits=(16, 2)), 'get_amount') + digits=(16, 2)), 'get_amount') def get_amount(self, name=None): res = [] diff --git a/payroll.xml b/payroll.xml index 9a32d9e..27d9db6 100644 --- a/payroll.xml +++ b/payroll.xml @@ -107,6 +107,35 @@ this repository contains the full copyright notices and license terms. --> payroll_form + + + staff_payroll_co.open_payroll_by_period.start + form + open_payroll_by_period_start_form + + + Open Payroll By Period + staff_payroll_co.open_payroll_by_period + + + + + + board + + payroll_by_period_board + + + Payroll by Period + + + + + + + staff_payroll_co.payroll_by_period_dynamic graph @@ -125,27 +154,6 @@ this repository contains the full copyright notices and license terms. --> - - board - - payroll_by_period_board - - - Payroll by Period - - - - - - - - - staff.payroll - tree - - payroll_list - Payroll by Period staff.payroll @@ -174,16 +182,6 @@ this repository contains the full copyright notices and license terms. --> - - staff_payroll_co.open_payroll_by_period.start - form - open_payroll_by_period_start_form - - - Open Payroll By Period - staff_payroll_co.open_payroll_by_period - - staff_payroll_co.payroll_by_period_dynamic tree @@ -199,8 +197,13 @@ this repository contains the full copyright notices and license terms. --> - + + + staff.payroll + tree + + payroll_list + staff.payroll_exo2276.start diff --git a/view/payroll_by_period_board.xml b/view/payroll_by_period_board.xml index cca4836..1a00c9c 100644 --- a/view/payroll_by_period_board.xml +++ b/view/payroll_by_period_board.xml @@ -1,6 +1,4 @@ -