Merge pull request #4653 from expsa/ky_dev_odex25_hr
Update payroll workflow
This commit is contained in:
commit
71d998322e
|
|
@ -1,5 +1,5 @@
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<data noupdate="1">
|
||||||
<!--Level sequence-->
|
<!--Level sequence-->
|
||||||
<record id="level_sequence" model="ir.sequence">
|
<record id="level_sequence" model="ir.sequence">
|
||||||
<field name="name">level_sequence_name</field>
|
<field name="name">level_sequence_name</field>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<data noupdate="1">
|
||||||
|
|
||||||
<record id="group_hr_payroll_contributor" model="res.groups">
|
<record id="group_hr_payroll_contributor" model="res.groups">
|
||||||
<field name="name">Contributor</field>
|
<field name="name">Contributor</field>
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,13 @@
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<menuitem id="exp_hr_payroll.menu_hr_payroll_employees_root" name="Payroll"
|
<menuitem id="exp_hr_payroll.menu_hr_payroll_root" name="Payroll"
|
||||||
parent="hr.menu_hr_root"
|
groups="exp_payroll_custom.group_hr_payroll_contributor,exp_hr_payroll.group_hr_payroll_user,exp_payroll_custom.group_payroll_finance_review,exp_payroll_custom.group_payroll_expense_manger,hr_base.group_account_manager,hr.group_hr_manager,hr_base.group_general_manager"/>
|
||||||
groups="exp_payroll_custom.group_hr_payroll_contributor,exp_hr_payroll.group_hr_payroll_user,base.group_user"/>
|
|
||||||
|
<menuitem id="exp_hr_payroll.menu_hr_payslip_run" sequence="1"
|
||||||
|
parent="exp_hr_payroll.menu_hr_payroll_root"
|
||||||
|
groups="hr_base.group_executive_manager,exp_payroll_custom.group_hr_payroll_contributor,exp_hr_payroll.group_hr_payroll_user,exp_payroll_custom.group_payroll_finance_review,exp_payroll_custom.group_payroll_expense_manger,hr_base.group_account_manager,hr.group_hr_manager,hr_base.group_general_manager"
|
||||||
|
/>
|
||||||
|
|
||||||
<record model="ir.ui.menu" id="exp_hr_payroll.menu_department_tree">
|
<record model="ir.ui.menu" id="exp_hr_payroll.menu_department_tree">
|
||||||
<field name="groups_id"
|
<field name="groups_id"
|
||||||
|
|
|
||||||
|
|
@ -291,20 +291,20 @@
|
||||||
<field name="employee_id"/>
|
<field name="employee_id"/>
|
||||||
<!-- <field name="name"/>-->
|
<!-- <field name="name"/>-->
|
||||||
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
|
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
|
||||||
<field name="date_from"/>
|
<field name="date_from" optional="hide"/>
|
||||||
<field name="date_to"/>
|
<field name="date_to" optional="hide"/>
|
||||||
<field name="payslip_run_id" invisible="1"/>
|
<field name="payslip_run_id" invisible="1"/>
|
||||||
<field name="basic_allowances" sum="Basic Salary"/>
|
<field name="basic_allowances" sum="Basic Salary"/>
|
||||||
<field name="house_allowances" sum="House Allowance"/>
|
<field name="house_allowances" sum="House Allowance"/>
|
||||||
<field name="trans_allowances" sum="Transport Allowance"/>
|
<field name="trans_allowances" sum="Transport Allowance"/>
|
||||||
<field name="other_allowances" sum="Others Allowance"/>
|
<field name="other_allowances" sum="Others Allowance"/>
|
||||||
|
<field name="total_allowances" sum="Total Allowance" decoration-bf="1"/>
|
||||||
<field name="employee_insurnce" sum="Employee Insurnce"/>
|
<field name="employee_insurnce" sum="Employee Insurnce"/>
|
||||||
<field name="total_allowances" sum="Total Allowance"/>
|
<field name="total_deductions" sum="Total Deduction" decoration-bf="1" decoration-danger="1"/>
|
||||||
<field name="total_deductions" sum="Total Deduction"/>
|
|
||||||
<field name="total_loans" sum="Total Loans" groups="hr_loans_salary_advance.group_loan_manager"/>
|
<field name="total_loans" sum="Total Loans" groups="hr_loans_salary_advance.group_loan_manager"/>
|
||||||
<!--field name="percentage" string="Percentage"/-->
|
<!--field name="percentage" string="Percentage"/-->
|
||||||
<field name="total_sum" sum="Total Net"/>
|
<field name="total_sum" sum="Total Net" decoration-bf="1" decoration-success="1"/>
|
||||||
<field name="state"/>
|
<field name="state" optional="hide"/>
|
||||||
</tree>
|
</tree>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue