From e5c69704a3d92a6757c7d64886189dd57457a4f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Degrave?= <fde@openerp.com>
Date: Wed, 29 Dec 2010 17:41:18 +0100
Subject: [PATCH] [IMP] removed salary structure from employee view

bzr revid: fde@openerp.com-20101229164118-5louilqm23my95ip
---
 addons/hr_payroll/hr_payroll_view.xml         | 60 -------------------
 .../hr_payroll_account_view.xml               | 34 -----------
 2 files changed, 94 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 07da73f224c..9ad5a88bc02 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -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>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 04fe9aa73ea..e62d2aecba3 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -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>