[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-pproject-configuration-Rearrange-fields-shp

bzr revid: atp@tinyerp.com-20120611071902-3k8drrwv0xys8j43

addons/project/res_config.py

@@ -46,6 +46,7 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),

addons/project/res_config_view.xml

@@ -7,28 +7,33 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
+           
                 <form string="Configure Project" layout="manual">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
+                  
                     <sheet layout="auto">
+                      <group> 
                         <separator string="Project" colspan="4"/>
+                        <field name="group_time_work_estimation_tasks"/>
+                        <field name="group_tasks_work_on_tasks"/>
+                        <field name="time_unit"/> 
                         <field name="module_project_mrp"/>
                         <field name="module_project_timesheet"/>
                         <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
-
                         <separator string="Planning" colspan="4"/>
                         <field name="module_project_long_term"/>
-
                         <separator string="Helpdesk and Support" colspan="4"/>
                         <field name="module_project_issue"/>
                         <field name="module_project_issue_sheet"/>
                         <group name="support" colspan="4"/>
+                       </group> 
                     </sheet>
+                   
                 </form>
+              
             </field>
         </record>