fix report payroll by period
This commit is contained in:
parent
aedd8ae5d6
commit
78aa215040
|
@ -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 = []
|
||||
|
|
69
payroll.xml
69
payroll.xml
|
@ -107,6 +107,35 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="name">payroll_form</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="open_payroll_by_period_start_view_form">
|
||||
<field name="model">staff_payroll_co.open_payroll_by_period.start</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">open_payroll_by_period_start_form</field>
|
||||
</record>
|
||||
<record model="ir.action.wizard" id="wizard_open_payroll_by_period">
|
||||
<field name="name">Open Payroll By Period</field>
|
||||
<field name="wiz_name">staff_payroll_co.open_payroll_by_period</field>
|
||||
</record>
|
||||
|
||||
<menuitem parent="staff.menu_reporting" action="wizard_open_payroll_by_period"
|
||||
id="open_payroll_by_period" icon="tryton-graph"/>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_by_period_board">
|
||||
<field name="type">board</field>
|
||||
<field name="model"></field>
|
||||
<field name="name">payroll_by_period_board</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window" id="act_payroll_by_period_board">
|
||||
<field name="name">Payroll by Period</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view"
|
||||
id="act_payroll_by_period_board_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view" ref="payroll_by_period_board"/>
|
||||
<field name="act_window" ref="act_payroll_by_period_board"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_by_period_view_graph">
|
||||
<field name="model">staff_payroll_co.payroll_by_period_dynamic</field>
|
||||
<field name="type">graph</field>
|
||||
|
@ -125,27 +154,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="act_window" ref="act_payroll_by_period_form2"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_by_period_board">
|
||||
<field name="type">board</field>
|
||||
<field name="model"></field>
|
||||
<field name="name">payroll_by_period_board</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window" id="act_payroll_by_period_board">
|
||||
<field name="name">Payroll by Period</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view"
|
||||
id="act_payroll_by_period_board_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view" ref="payroll_by_period_board"/>
|
||||
<field name="act_window" ref="act_payroll_by_period_board"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_view_list">
|
||||
<field name="model">staff.payroll</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="priority" eval="20"/>
|
||||
<field name="name">payroll_list</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window" id="act_payroll_by_period">
|
||||
<field name="name">Payroll by Period</field>
|
||||
<field name="res_model">staff.payroll</field>
|
||||
|
@ -174,16 +182,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="action" ref="act_payroll_by_period"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="open_payroll_by_period_start_view_form">
|
||||
<field name="model">staff_payroll_co.open_payroll_by_period.start</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">open_payroll_by_period_start_form</field>
|
||||
</record>
|
||||
<record model="ir.action.wizard" id="wizard_open_payroll_by_period">
|
||||
<field name="name">Open Payroll By Period</field>
|
||||
<field name="wiz_name">staff_payroll_co.open_payroll_by_period</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="open_payroll_by_period_view_tree">
|
||||
<field name="model">staff_payroll_co.payroll_by_period_dynamic</field>
|
||||
<field name="type">tree</field>
|
||||
|
@ -199,8 +197,13 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="view" ref="open_payroll_by_period_view_tree"/>
|
||||
<field name="act_window" ref="act_payroll_by_period_tree"/>
|
||||
</record>
|
||||
<menuitem parent="staff.menu_reporting" action="wizard_open_payroll_by_period"
|
||||
id="open_payroll_by_period" icon="tryton-graph"/>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_view_list">
|
||||
<field name="model">staff.payroll</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="priority" eval="20"/>
|
||||
<field name="name">payroll_list</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="payroll_exo2276_start_view_form">
|
||||
<field name="model">staff.payroll_exo2276.start</field>
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<board>
|
||||
<hpaned id="payroll_by_period">
|
||||
<child id="tree">
|
||||
|
|
Loading…
Reference in New Issue