[IMP]improve and clean hr_department hr_job, hr_payroll_status,hr,hr_holidays as per new form view guidelines
bzr revid: sgo@tinyerp.com-20120621132501-srjmo019uho1mgif
This commit is contained in:
Sanjay Gohel (Open ERP)
parent
252ad631ad
commit
cf2b8e1737
|
|
@ -15,8 +15,8 @@
|
|||
<form string="department" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="manager_id"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -357,17 +357,20 @@
|
|||
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group>
|
||||
<group>
|
||||
<field name="name" />
|
||||
<field name="department_id" />
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
|
||||
<field name="no_of_employee"/>
|
||||
<field name="expected_employees"/>
|
||||
</group>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name" />
|
||||
(<field name="department_id"/>)
|
||||
</h1>
|
||||
<label for="employee_ids" class="oe_edit_only"/>
|
||||
<h2>
|
||||
<field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
|
||||
</h2>
|
||||
<group col="4">
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
|
||||
<field name="no_of_employee"/>
|
||||
<field name="expected_employees"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Description">
|
||||
|
|
@ -376,9 +379,6 @@
|
|||
<label for="requirements"/>
|
||||
<field name="requirements"/>
|
||||
</page>
|
||||
<page string="Employees">
|
||||
<field name="employee_ids" widget="many2many" mode="tree,form"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -368,22 +368,12 @@
|
|||
<form string="Leave Type" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="color_name"/>
|
||||
<field name="double_validation"/>
|
||||
<field name="categ_id" widget="selection"/>
|
||||
<field name="limit"/>
|
||||
<field name="color_name"/>
|
||||
<field name="active"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Details">
|
||||
<group>
|
||||
<group name="selection" string="Validation">
|
||||
<field name="double_validation"/>
|
||||
<field name="limit"/>
|
||||
</group>
|
||||
<group name="second" string="Misc">
|
||||
<field name="active"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
<field name="model">hr.payroll.structure</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Employee Function">
|
||||
<form string="Employee Function" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
|
|
@ -224,6 +224,12 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<act_window name="Payslip Computation Details"
|
||||
context="{'default_slip_id': active_id,'search_default_slip_id': active_id}"
|
||||
res_model="hr.payslip.line"
|
||||
src_model="hr.payslip"
|
||||
id="act_payslip_lines"/>
|
||||
|
||||
<record id="view_hr_payslip_form" model="ir.ui.view">
|
||||
<field name="name">hr.payslip.form</field>
|
||||
|
|
@ -240,6 +246,9 @@
|
|||
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<div class="oe_right oe_button_box">
|
||||
<button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
|
||||
</div>
|
||||
<label for="employee_id" class="oe_edit_only"/>
|
||||
<h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
|
||||
<label for="date_from" class="oe_edit_only" string="Period"/>
|
||||
|
|
@ -335,13 +344,13 @@
|
|||
</field>
|
||||
</page>
|
||||
<page string="Other Information">
|
||||
<group col="2" string="Other Information">
|
||||
<group col="2">
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="payslip_run_id" domain="[('state','=','draft')]"/>
|
||||
<field name="paid" readonly="1"/>
|
||||
</group>
|
||||
<group string="Notes">
|
||||
<field name="note"/>
|
||||
<div>
|
||||
<field name="note" Placeholder="Add an internal note..."/>
|
||||
</div>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -740,11 +749,18 @@
|
|||
<field name="state" widget="statusbar"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name"/>
|
||||
<field name="credit_note"/>
|
||||
<field name="date_start"/>
|
||||
</h1>
|
||||
<h2>
|
||||
Period from
|
||||
<field name="date_start"/>
|
||||
to
|
||||
<field name="date_end"/>
|
||||
</h2>
|
||||
<group col="4">
|
||||
<field name="credit_note"/>
|
||||
</group>
|
||||
<field name="slip_ids"/>
|
||||
</sheet>
|
||||
|
|
@ -763,13 +779,6 @@
|
|||
|
||||
<!-- Shortcuts -->
|
||||
|
||||
<act_window name="Payslip Computation Details"
|
||||
domain="[('slip_id', '=', active_id)]"
|
||||
context="{'default_slip_id': active_id}"
|
||||
res_model="hr.payslip.line"
|
||||
src_model="hr.payslip"
|
||||
id="act_payslip_lines"/>
|
||||
|
||||
<act_window name="Payslip Lines"
|
||||
domain="[('register_id', '=', active_id)]"
|
||||
context="{'default_register_id': active_id, 'search_default_register_id': 1}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue