Skip to content

Commit

Permalink
- Fixed wrong account assigned to NET CH
Browse files Browse the repository at this point in the history 
- Added filters for each account in wizard view
  • Loading branch information
@open-net-sarl
open-net-sarl committed Mar 21, 2017
1 parent ac48d48 commit c647b7e
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 17 deletions.
1 change: 1 addition & 0 deletions l10n_ch_hr_payroll/__manifest__.py
View file
Expand Up @@ -51,6 +51,7 @@
'data/hr.salary.rule.xml',
'views/hr_employee_view.xml',
'views/hr_contract_view.xml',
'views/hr_payroll_view.xml',
'views/hr_payroll_config_view.xml',
'views/hr_payslip_view.xml',
'views/lpp_contract_view.xml'
Expand Down
12 changes: 7 additions & 5 deletions l10n_ch_hr_payroll/models/hr_payroll_config.py
View file
Expand Up @@ -22,7 +22,7 @@ def _get_default_cc(self):
('l10n_ch_hr_payroll.LAA_E', 'credit'),
('l10n_ch_hr_payroll.LCA_E', 'credit'),
('l10n_ch_hr_payroll.LPP_E', 'credit'),
('l10n_ch_hr_payroll.NET_CH', 'credit')])
('l10n_ch_hr_payroll.NET_CH', 'debit')])

return all_equal

Expand All @@ -39,7 +39,7 @@ def _get_default_basic(self):
def _get_default_net(self):
all_equal = False
all_equal = self.search_account_by_rule([
('l10n_ch_hr_payroll.NET_CH', 'debit')])
('l10n_ch_hr_payroll.NET_CH', 'credit')])

return all_equal

Expand Down Expand Up @@ -341,9 +341,11 @@ def save_configs(self):
'l10n_ch_hr_payroll.BASIC_CH',
'l10n_ch_hr_payroll.LAA_E',
'l10n_ch_hr_payroll.LCA_E',
'l10n_ch_hr_payroll.LPP_E',
'l10n_ch_hr_payroll.NET_CH'
'l10n_ch_hr_payroll.LPP_E'
], config.cc, 'credit')
config.assign_account_to_rule([
'l10n_ch_hr_payroll.NET_CH'
], config.cc, 'debit')

# basic
config.assign_account_to_rule([
Expand All @@ -353,7 +355,7 @@ def save_configs(self):
# net
config.assign_account_to_rule([
'l10n_ch_hr_payroll.NET_CH'
], config.net, 'debit')
], config.net, 'credit')

# avs_d
config.assign_account_to_rule([
Expand Down
51 changes: 41 additions & 10 deletions l10n_ch_hr_payroll/views/hr_payroll_config_view.xml
View file
Expand Up @@ -20,32 +20,63 @@ Copyright (c) 2017 Open Net Sàrl
<h1>General</h1>
</div>
<group>
<field name="basic"/>
<field name="net"/>
<field name="cc"/>
<field
name="basic"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
<field name="net"
domain="[
('user_type_id', '=', %(account.data_account_type_payable)d),
('code', 'like', '20__')]"/>
<field name="cc"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
</group>
<div class="oe_title">
<h1>Standard Rules</h1>
</div>
<group>
<group string="OAI/II/IC">
<field name="avs_d"/>
<field name="avs_c"/>
<field name="avs_d"
domain="[
('user_type_id', '=', %(account.data_account_type_current_liabilities)d),
('code', 'like', '22__')]"/>
<field name="avs_c"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
</group>
<group string="OBP">
<field name="lpp_d"/>
<field name="lpp_c"/>
<field name="lpp_d"
domain="[
('user_type_id', '=', %(account.data_account_type_current_liabilities)d),
('code', 'like', '22__')]"/>
<field name="lpp_c"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
</group>
</group>
<group colspan="2">
<field name="laa_c"/>
<field name="laa_c"
domain="[
('user_type_id', '=', %(account.data_account_type_current_liabilities)d),
('code', 'like', '22__')]"/>
</group>
<div class="oe_title">
<h1>Special Rules</h1>
</div>
<group>
<field name="staff_ins"/>
<field name="other_costs"/>
<field name="staff_ins"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
<field name="other_costs"
domain="[
('user_type_id', '=', %(account.data_account_type_expenses)d),
('code', 'like', '5___')]"/>
</group>
</page>
<page string="Parameters">
Expand Down
41 changes: 41 additions & 0 deletions l10n_ch_hr_payroll/views/hr_payroll_view.xml
View file
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
File: views/hr_payroll_view.xml
Module: l10n_ch_hr_payroll
Created by lfr@open-net.ch
Copyright (c) 2017 Open Net Sàrl
-->
<odoo>
<data>
<record model="ir.ui.view" id="hr_salary_rule_list_l10n_ch_inherit1">
<field name="name">hr.salary.rule.list_l10n_ch_inherit1</field>
<field name="model">hr.salary.rule</field>
<field name="inherit_id" ref="hr_payroll.hr_salary_rule_list"/>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<xpath expr="//tree" position="attributes">
<attribute name="default_order" translation="off">sequence</attribute>
</xpath>
<xpath expr="//tree/field[@name='name']" position="before">
<field name="sequence"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_payroll_struc_l10n_ch_inherit1">
<field name="name">hr.payroll.struc_l10n_ch_inherit2</field>
<field name="model">hr.payroll.structure</field>
<field name="inherit_id" ref="hr_payroll.view_hr_employee_grade_form"/>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='rule_ids']/tree" position="attributes">
<attribute name="default_order" translation="off">sequence</attribute>
</xpath>
<xpath expr="//field[@name='rule_ids']/tree/field[@name='name']" position="before">
<field name="sequence"/>
</xpath>
</field>
</record>
</data>
</odoo>
2 changes: 1 addition & 1 deletion l10n_ch_hr_payroll/views/hr_payslip_view.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
File: views/hr_contract_view.xml
File: views/hr_payslip_view.xml
Module: l10n_ch_hr_payroll
Created by lfr@open-net.ch
Expand Down
2 changes: 1 addition & 1 deletion l10n_ch_hr_payroll/views/lpp_contract_view.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
File: views/hr_contract_view.xml
File: views/lpp_contract_view.xml
Module: l10n_ch_hr_payroll
Created by lfr@open-net.ch
Expand Down

0 comments on commit c647b7e

Please sign in to comment.