← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-751299-skh into lp:openobject-addons

 

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

Requested reviews:
  OpenERP Core Team (openerp)
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/56516

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/56516
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-03-11 11:32:04 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-04-06 07:01:08 +0000
@@ -361,6 +361,12 @@
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
+                          <group colspan="4" col="4" name="statistics">
+                              <separator string="Leave Status" colspan="4"/>
+                              <field name="max_leaves"/>
+                              <field name="leaves_taken"/>
+                              <field name="remaining_leaves"/>
+                          </group>                          
                           <group colspan="2" col="2" name="selection">
                               <separator string="Validation" colspan="2"/>
                               <field name="double_validation"/>


Follow ups