odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] removed salary structure from employee view 

bzr revid: fde@openerp.com-20101229164118-5louilqm23my95ip
This commit is contained in:
François Degrave 2010-12-29 17:41:18 +01:00
parent 889038611d
commit e5c69704a3
2 changed files with 0 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
addons/hr_payroll/hr_payroll_view.xml
View File

@ -107,66 +107,6 @@
</group>
</page>
</xpath>
<xpath expr="/form/notebook/page[@string='Notes']" position="before">
<page string="Salary Structure" groups="base.group_hr_manager">
<group col="10" colspan="4">
<separator string="Salary Computation" colspan="10"/>
<field name="basic"/>
<field name="advantages_gross"/>
<field name="gross"/>
<field name="advantages_net"/>
<field name="net"/>
</group>
<separator string="Employee specific allowances and deductions" colspan="4"/>
<field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
<tree string="Salary Structure" editable="bottom">
<field name="category_id" on_change="onchange_category(category_id)"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
<field name="amount_type"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)"/>
</tree>
<form string="Payslip Line">
<group col="6" colspan="4">
<field name="name" colspan="4" select="1"/>
<field name="code" select="1"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Calculations"/>
<field name="category_id" on_change="onchange_category(category_id)"/>
<field name="type"/>
<field name="amount_type"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
<field name="sequence" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Company contribution"/>
<field name="company_contrib"/>
</group>
<notebook colspan="4">
<page string="Function">
<field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
<tree string="Function Arguments" editable="bottom">
<field name="name"/>
<field name="sequence" groups="base.group_extended"/>
<field name="from_val"/>
<field name="to_val"/>
<field name="amount_type"/>
<field name="value"/>
</tree>
</field>
</page>
<page string="Description">
<separator colspan="4" string="Description"/>
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</page>
</xpath>
</data>
</field>
</record>

34
addons/hr_payroll_account/hr_payroll_account_view.xml
View File

@ -2,40 +2,6 @@
<openerp>
<data>
<record id="hr_hr_employee_view_form2_inherit_2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2.inherit_1</field>
<field name="model">hr.employee</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Salary Structure']" position="after">
<page string="Accounting">
<field name="property_bank_account" required="1"/>
<field name="salary_account" required="1"/>
<field name="employee_account" required="1"/>
<field name="analytic_account"/>
<field name="slip_ids" colspan="4" nolabel="1"/>
</page>
</xpath>
</field>
</record>
<record id="hr_hr_employee_view_form2_inherit_1" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2.inherit</field>
<field name="model">hr.employee</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
<field name="account_id"/>
<field name="analytic_account_id"/>
</xpath>
<xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='code']" position="after">
<field name="account_id"/>
<field name="analytic_account_id"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_holiday_status_inherit_form1">
<field name="name">hr.holidays.status.inherit1</field>