From 07e5b120e608f43973c7250b831800ca637d2e5b Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 22 Jun 2012 17:16:01 +0530
Subject: [PATCH] [IMP] improved the view of project related modules

bzr revid: bde@tinyerp.com-20120622114601-58ivi12560qpw51l
---
 addons/project/project_view.xml                    |  2 +-
 addons/project_issue/project_issue_view.xml        |  5 ++++-
 .../project_issue_sheet_view.xml                   | 14 +++++++++-----
 .../project_long_term/project_long_term_view.xml   |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f883f007bd6..f6c72655a41 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -361,10 +361,10 @@
                     <group>
                         <group>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2b93cfec105..5b48fc8d987 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -90,7 +90,6 @@
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
                             <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                            <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
                     <field name="description" placeholder="Add a description..." />
@@ -111,6 +110,10 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
+                            <group colspan="4" col="4">
+                                <separator string="State" colspan="4"/>
+                                <field name="state" groups="base.group_no_one"/>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2a98f186922..d883fadf2d9 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -10,11 +10,15 @@
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
-                <xpath expr="//notebook" position="before">
-                    <field name="analytic_account_id"
-                        domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
-                        on_change='on_change_account_id(analytic_account_id)'/>
-                </xpath>
+                <field name="active" position="after">
+                    <separator string="Analytic Account" colspan="4"/>
+                    <newline/>
+                    <group colspan="4" col="4"> 
+                        <field name="analytic_account_id"
+                            domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                            on_change='on_change_account_id(analytic_account_id)'/>
+                    </group>
+                </field>
                 <xpath expr="//notebook/page[@string='Extra Info']" position="before">
                     <page string="Worklogs">
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18babab66a4..8750c98728f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -212,7 +212,7 @@
                                     <field name="sequence"/>
                                 </group>
                             </group>
-                           <separator string="Force Assigned Users"/>
+                           <h2><label string="Force Assigned Users"/></h2> 
                            <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
@@ -325,7 +325,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>