[IMP]:improved views
bzr revid: apa@tinyerp.com-20120625100530-b1ba3l7g3i7pnaav
This commit is contained in:
parent
6ebcfe8ac1
commit
23de44d8ff
|
@ -13,12 +13,14 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="department" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="manager_id"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="manager_id"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -366,8 +366,8 @@
|
|||
<sheet>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name" />
|
||||
(<field name="department_id"/>)
|
||||
<field name="name" class="oe_inline"/>
|
||||
(<field name="department_id" class="oe_inline"/>)
|
||||
</h1>
|
||||
<label for="employee_ids" class="oe_edit_only"/>
|
||||
<h2>
|
||||
|
|
|
@ -365,14 +365,20 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Leave Type" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="double_validation"/>
|
||||
<field name="categ_id" widget="selection"/>
|
||||
<field name="limit"/>
|
||||
<field name="color_name"/>
|
||||
<field name="active"/>
|
||||
</group>
|
||||
<sheet>
|
||||
<group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="categ_id"/>
|
||||
<field name="color_name"/>
|
||||
<field name="active"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="double_validation"/>
|
||||
<field name="limit"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -248,13 +248,15 @@
|
|||
<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"/>
|
||||
<h2>
|
||||
from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
|
||||
to <field name="date_to"/>
|
||||
</h2>
|
||||
<div class="oe_title">
|
||||
<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"/>
|
||||
<h2>
|
||||
From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
|
||||
to <field name="date_to"/>
|
||||
</h2>
|
||||
</div>
|
||||
<group col="4">
|
||||
<field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
|
||||
<field name="number"/>
|
||||
|
|
Loading…
Reference in New Issue