openerp-dev-web team mailing list archive

["Somesh Khare\(OpenERP\)" <skh@xxxxxxxxxxx>]

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-751299-skh into lp:openobject-addons.

Requested reviews:
  Mustufa Rangwala (Open ERP) (mra-tinyerp)
  Somesh Khare(OpenERP) (skh-openerp)
  qdp (OpenERP) (qdp)
Related bugs:
  Bug #751299 in OpenERP Addons: "[PS] List view of leaves type contains different fields as the form view"
  https://bugs.launchpad.net/openobject-addons/+bug/751299

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751299-skh/+merge/58634

Hello,

[Fix]: [PS] List view of leaves type contains different fields as the form view.

Thanks,
skh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751299-skh/+merge/58634
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-751299-skh.

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-04-20 11:54:41 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-04-21 07:06:21 +0000
@@ -390,7 +390,19 @@
                 </tree>
             </field>
         </record>
-
+        <record model="ir.ui.view" id="view_holiday_leave_type_tree">
+            <field name="name">hr.holidays.status.leave.type.tree</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">tree</field>
+            <field name="sequence" eval="40"/>
+            <field name="arch" type="xml">
+                <tree string="Leave Type">
+                    <field name="name"/>
+                    <field name="limit" />
+                </tree>
+            </field>
+        </record>
+        
         <record id="view_hr_holidays_status_search" model="ir.ui.view">
             <field name="name">hr.holidays.status.search</field>
             <field name="model">hr.holidays.status</field>
@@ -402,19 +414,19 @@
                 </search>
             </field>
         </record>
-
+        
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="view_holiday_status_tree"/>
+            <field name="view_id" eval="view_holiday_leave_type_tree"/>
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
-
+        
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-
+        
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"