openerp-dev-web team mailing list archive

["Atik Agewan\(OpenERP\)" <aag@xxxxxxxxxxx>]

Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag/+merge/62872


Hello 

 Hr_holidays,hr : Rename saprator "position" into "job information and inherit remaining legal leaves 
                 field to hr.employee form'

Thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag/+merge/62872
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2011-04-20 12:34:21 +0000
+++ hr/hr_view.xml	2011-05-30 12:18:26 +0000
@@ -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>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-05-27 11:39:19 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-05-30 12:18:26 +0000
@@ -470,6 +470,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>