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 1/3] [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>

From 3ed27adc6d269e7a911d54f97f91def721a9be48 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 22 Jun 2012 18:55:36 +0530
Subject: [PATCH 2/3] [IMP] improved views of project module under
 configuration wizard

bzr revid: bde@tinyerp.com-20120622132536-3ig2s3zwm0n1x06n
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 addons/resource/resource_view.xml       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index edfff777c3e..31d30fc1d94 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -449,8 +449,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
-                <field name="date_to" position="after">
-                    <field name="holiday_id"/>
+                <field name="name" position="after">
+                    <field name="holiday_id" string="Leave Request"/>
                 </field>
             </field>
         </record>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4da1a465c42..f3c7deaa994 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -117,7 +117,7 @@
             <field name="model">resource.calendar.attendance</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Working Time">
+                <tree string="Working Time" editable="top">
                     <field name="name"/>
                     <field name="dayofweek"/>
                     <field name="hour_from" widget="float_time" />
@@ -229,12 +229,12 @@
                            <field name="name" string="Reason"/>
                        </group>
                        <group>
-                           <field name="date_from"/>
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group>
-                           <field name="date_to"/>
+                       <group col="4">
+                       <field name="date_from" string="Duration"/>
+                       <field name="date_to" nolabel="1"/>
                        </group>
                    </group>
                    </sheet>

From 83d2af86765314ee40dac91a7dbc0e1f0f4a3414 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 13:00:40 +0530
Subject: [PATCH 3/3] [IMP] improved view for date fields

bzr revid: bde@tinyerp.com-20120625073040-mtdcgxi9tkjqg0a1
---
 addons/resource/resource_view.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f3c7deaa994..003bbd8810c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -120,8 +120,8 @@
                 <tree string="Working Time" editable="top">
                     <field name="name"/>
                     <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time" />
-                    <field name="hour_to" widget="float_time" />
+                    <field name="hour_from" widget="float_time"/>
+                    <field name="hour_to" widget="float_time"/>
                 </tree>
             </field>
         </record>
@@ -132,11 +132,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <field name="date_from"/>
-                    <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
+                    <group colspan="4"> 
+                        <field name="name"/>
+                        <field name="date_from"/>
+                        <field name="dayofweek"/>
+                        <label for="hour_from" string="Hours"/>
+                        <div>
+                            <field name="hour_from" widget="float_time"/>-
+                            <field name="hour_to" widget="float_time"/>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
@@ -232,9 +237,12 @@
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group col="4">
-                       <field name="date_from" string="Duration"/>
-                       <field name="date_to" nolabel="1"/>
+                       <group col="2" colspan="4">
+                           <label for="date_from" string="Duration"/> 
+                           <div>
+                               <field name="date_from" nolabel="1"/> - 
+                               <field name="date_to" nolabel="1"/>
+                           </div>
                        </group>
                    </group>
                    </sheet>