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

[MERGE]:merged blocking point related hr view 

bzr revid: apa@tinyerp.com-20120907071419-yw37hc1f4r3259ha
This commit is contained in:
Amit Patel (OpenERP) 2012-09-07 12:44:19 +05:30
parent 8d76935198 cd025ef084
commit f4d67deeea
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/hr/hr_view.xml
View File

@ -20,7 +20,7 @@
<field name="arch" type="xml">
<form string="Employee" version="7.0">
<sheet>
<field name="image_medium" widget='image' class="oe_right oe_avatar"/>
<field name="image_medium" widget='image' class="oe_left oe_avatar"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
@ -41,17 +41,15 @@
<field name="mobile_phone"/>
</group>
<group string="Position">
<field name="department_id" on_change="onchange_department_id(department_id)"/>
<field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
<field name="parent_id"/>
<field name="coach_id"/>
</group>
<group>
<field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
<field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
<field name="department_id" on_change="onchange_department_id(department_id)"/>
</group>
<group>
<field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
<field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
</group>
</group>
<field name="notes" placeholder="Other Information ..." colspan="4"/>

4
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
View File

@ -38,11 +38,11 @@
<record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
<field name="name">hr.employee.inherit.form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
<field name="priority">30</field>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='gender']" position="before">
<xpath expr="//field[@name='vehicle_distance']" position="after">
<field name="resident_bool" eval="False"/>
</xpath>
<xpath expr="//field[@name='marital']" position="after">

8
addons/portal_event/event_view.xml
View File

@ -8,12 +8,8 @@
<field name="model">event.event</field>
<field name="inherit_id" ref="event.view_event_form"/>
<field name="arch" type="xml">
<xpath expr="//page[last()]" position="after">
<page string="Portal Settings">
<group>
<field name="visibility"/>
</group>
</page>
<xpath expr="//field[@name='active']" position="before">
<field name="visibility"/>
</xpath>
</field>
</record>

8
addons/portal_hr_employees/hr_employee_view.xml
View File

@ -8,12 +8,8 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<xpath expr="//page[last()]" position="after">
<page string="Portal Settings">
<group>
<field name="visibility"/>
</group>
</page>
<xpath expr="//field[@name='active']" position="before">
<field name="visibility"/>
</xpath>
</field>
</record>