Presik
/
trytonpsk-staff_payroll_co
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add tabs

This commit is contained in:
Oscar Alvarez 2020-12-03 15:08:04 -05:00
parent 99b8919d7f
commit 7a74398123
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
liquidation.py
View File

@ -330,20 +330,6 @@ class Liquidation(Workflow, ModelSQL, ModelView):
grouped[moveline.account.id]['amount'].append(moveline.credit)
grouped[moveline.account.id]['lines'].append(moveline)
amount.append(moveline.credit)
else:
# Maybe this is not neccesary
# if line.wage.credit_account and line.amount > 0:
# grouped[line.wage.credit_account.id] = {
# 'amount': [line.amount],
# 'description': line.description,
# 'lines': [],
# }
# amount.append(line.amount)
# else:
# lines_moves.append(self._prepare_line(self.description,
# line.wage.credit_account, credit=(abs(line.amount))))
# amount.append(line.amount)
pass
for adjust in line.adjustments:
if adjust.account.id not in grouped.keys():

28
liquidation.xml
View File

@ -28,9 +28,26 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="liquidation_view_form"/>
<field name="act_window" ref="act_liquidation_form"/>
</record>
<menuitem name="Liquidation" parent="staff.menu_staff"
sequence="90" id="menu_staff_liquidation"
action="act_liquidation_form"/>
<record model="ir.action.act_window.domain" id="act_liquidation_form_domain_draft">
<field name="name">Draft</field>
<field name="sequence" eval="10"/>
<field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
<field name="act_window" ref="act_liquidation_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_liquidation_form_domain_confirmed">
<field name="name">Confirmed</field>
<field name="sequence" eval="20"/>
<field name="domain" eval="[('state', '=', 'confirmed')]" pyson="1"/>
<field name="act_window" ref="act_liquidation_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_liquidation_form_domain_all">
<field name="name">All</field>
<field name="sequence" eval="20"/>
<field name="domain" eval="[]" pyson="1"/>
<field name="act_window" ref="act_liquidation_form"/>
</record>
<menuitem name="Liquidation" parent="staff.menu_staff" sequence="90"
id="menu_staff_liquidation" action="act_liquidation_form"/>
<record model="ir.ui.view" id="liquidation_line_view_form">
<field name="model">staff.liquidation.line</field>
@ -73,11 +90,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>
<!-- <record model="ir.ui.view" id="check_list_view_form">
<field name="model">staff.liquidation.line_adjust</field>
<field name="type">form</field>
<field name="name">liquidation_line_adjust_view_form</field>
</record> -->
<record model="ir.ui.view" id="liquidation_line_adjustment_view_tree">
<field name="model">staff.liquidation.line_adjustment</field>
<field name="type">tree</field>