[MERGE] lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp

bzr revid: pja@tinyerp.com-20120613130836-5f9x2d3si2bcmnpq

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c2c9645..9c20baf 100644 (file)
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
+                       <sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
                         <field name="action"/>
                         <field name="action_desc"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 6f2ad46..fb97b4e 100644 (file)
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -66,7 +66,8 @@
             <field name="model">hr.contract</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contract">
+                <form string="Contract" version="7.0">
+                       <sheet>
                     <group col="4">
                         <field name="name" />
                         <field name="employee_id" />
@@ -101,6 +102,7 @@
                             </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>