[MERGE] merged aag branch with hr_holidays usability improvements

bzr revid: qdp-launchpad@openerp.com-20110608144616-k80dn77ii0f3dlj5

addons/hr/hr_view.xml

@@ -63,7 +63,7 @@
                                 <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Position" colspan="2"/>
+                                <separator string="Job Information" colspan="2"/>
                                 <field name="job_id" domain="[('state','!=','old')]"/>
                                 <field name="coach_id" />
                             </group>

addons/hr_holidays/hr_holidays_view.xml

@@ -471,6 +471,20 @@
            <field name="type">normal</field>
            <field name="state">skip</field>
        </record>        
+       
+        <!-- Hr employee inherit Legal Leaves -->
+    
+        <record id="view_employee_form_leave_inherit" model="ir.ui.view">
+            <field name="name">hr.employee.leave.form.inherit</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="coach_id" position="after">
+                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>