Merge lp:~openerp-dev/openobject-addons/7.0-bug-1181939-cga into lp:openobject-addons/7.0

[Chandni Gandhi(OpenERP)]

Hello,

Set view of Other Info tab in Project.

Thanks.
CGA

Unmerged revisions

9142. By Chandni Gandhi(OpenERP) on 2013-05-20

[FIX]:Set view of Other Info tab in Project

9141. By Chandni Gandhi(OpenERP) on 2013-05-20

[MERGE]:with latest 7.0

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-05-16 10:16:16 +0000
+++ project/project_view.xml	2013-05-20 09:24:28 +0000
@@ -131,6 +131,11 @@
                         </page>
                         <page string="Other Info">
                             <group>
+                                <group string="Administration" groups="project.group_time_work_estimation_tasks">
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time"/>
+                                    <field name="resource_calendar_id"/>
+                                </group>
                                 <group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <div>
                                         <field name="alias_id" invisible="1" required="0"/>
@@ -138,11 +143,6 @@
                                         <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
                                     </div>
                                 </group>
-                                <group string="Administration" groups="project.group_time_work_estimation_tasks">
-                                    <field name="planned_hours" widget="float_time"/>
-                                    <field name="effective_hours" widget="float_time"/>
-                                    <field name="resource_calendar_id"/>
-                                </group>
                                 <group string="Miscellaneous" name="misc">
                                     <field name="date_start"/>
                                     <field name="date" string="End Date"/>