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

[IMP]:hr,hr_contract:improved view 

bzr revid: apa@tinyerp.com-20120625062922-lvv1arp9yr7z801y
This commit is contained in:
Amit Patel (OpenERP) 2012-06-25 11:59:22 +05:30
parent 0b367184b5
commit 87e079367a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/hr_view.xml
View File

@ -30,7 +30,7 @@
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1> <h1>
<field name="name" class="oe_inline"/> <field name="name" class="oe_inline"/>
<label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/> <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
<field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/> <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
<label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/> <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
<field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/> <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>

6
addons/hr_contract/hr_contract_view.xml
View File

@ -87,9 +87,9 @@
<field name="trial_date_end" /> <field name="trial_date_end" />
</group> </group>
</group> </group>
<group col="4"> <group>
<group col="1" name="advantages" colspan="2"> <group name="right_column" string="Advantages">
<field name="advantages"/> <field name="advantages" nolabel="1"/>
</group> </group>
</group> </group>
<separator string="Notes"/> <separator string="Notes"/>

4
addons/hr_payroll/hr_payroll_view.xml
View File

@ -18,8 +18,8 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/> <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//group[@name='advantages']" position="before"> <xpath expr="//group[@name='right_column']" position="before">
<group col="3" colspan="2"> <group string="Payslip Info">
<field name="struct_id" required="1"/> <field name="struct_id" required="1"/>
</group> </group>
</xpath> </xpath>