From a9e1ede2774dd01d272bf1bb8248114697df2281 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Thu, 14 Jun 2012 13:01:54 +0530
Subject: [IMP]:Project:Added Active and return flow

bzr revid: tch@tinyerp.com-20120614073154-fhpy06yyex5x0h8a
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1717fb950f7..87ca1a9f6c8 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,9 +143,9 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft"/>
-                    <button string="Done" name="set_done" states="pending,open"/>
-                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
+                    <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
+                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_active_flow"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-- 
cgit v1.2.3


From 0d35f923bfa02e75015ba4a8c7de4e2816810e1a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 14 Jun 2012 18:47:35 +0530
Subject: [IMP] project_long_term: improved color of button based on business
 flow

bzr revid: tpa@tinyerp.com-20120614131735-vgjxy0dek0yhw1wh
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 87ca1a9f6c8..e4839017e72 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -135,7 +135,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_active_flow"/>
-                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
+                    <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From e80980330b63f1c25ab7a582164975c4402bff09 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 20 Jun 2012 15:42:05 +0530
Subject: [USA] replaced red button class oe_form_button_active_flow to
 oe_highlight

bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0d1b8ebd8c4..7ddc7fec1ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,8 +143,8 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
-                    <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
                     <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
                     <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-- 
cgit v1.2.3


From 501721883d488f6a6981bdb49ac112943d32001f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 21 Jun 2012 12:39:59 +0530
Subject: [USB] removed useless class defination

bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8891e5f777c..2dc5137b4ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
-                    <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
+                    <button string="Pending" name="set_pending" states="open" />
+                    <button string="Draft" name="set_draft" states="open" />
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From 91be67f77458d8d17d10a932b5e848e0b5a45ae3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 25 Jun 2012 18:06:35 +0530
Subject: [USA] remove red button class oe_highlight in module  project and
 contract for done and close button

bzr revid: rma@tinyerp.com-20120625123635-28qyp2scvwrd148d
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6d992a96cdc..aaee541c9e6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -144,7 +144,7 @@
                 <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
-                    <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open" />
                     <button string="Pending" name="set_pending" states="open" />
                     <button string="Draft" name="set_draft" states="open" />
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-- 
cgit v1.2.3


From db72c57687a9975c9e45362bb4d2c96343d8910c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 18:49:31 +0530
Subject: [IMP] project phase view change

bzr revid: kjo@tinyerp.com-20120625131931-i1bo061rk7215omo
---
 addons/project_long_term/project_long_term_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b527d511d5f..faa09eaed95 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,23 +151,24 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
+                    <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
                     </h2>
+                    </div>
                     <group>
-                        <group>
-                            <field name="date_start"/>
-                            <field name="date_end"/>
-                        </group><group>
-                            <label for="duration"/>
-                            <div>
-                                <field name="duration" class="oe_inline"/>
-                                <field name="product_uom"/>
-                            </div>
-                        </group>
+                    <label for="date_start" string="Duration"/>
+                    <div>
+                        <field name="date_start" nolabel="1" class="oe_inline"/>    -
+                        <field name="date_end" nolabel="1" class="oe_inline"/>
+                        <div>
+                        <field name="duration" nolabel="1" class="oe_inline"/>
+                        <field name="product_uom" nolabel="1" class="oe_inline"/>
+                        </div>
+                    </div>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
-- 
cgit v1.2.3


From 7c114fa26a0e5b8b4312f73f717a3274245b393a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 12:12:08 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629101208-fmfa4k5dgm818aqy
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e313f8944b2..ec575a514c1 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -145,9 +145,9 @@
                 <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
-                    <button string="Done" name="set_done" states="pending,open" />
-                    <button string="Pending" name="set_pending" states="open" />
-                    <button string="Draft" name="set_draft" states="open" />
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-- 
cgit v1.2.3


From 89f6e166755884de1fbbd58dbf02e90ea8908180 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 2 Jul 2012 18:37:25 +0200
Subject: [IMP] usability: form views

bzr revid: qdp-launchpad@openerp.com-20120702163725-14j93jkw3qtl8368
---
 addons/project_long_term/project_long_term_view.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eeec5f154fc..a98e9088402 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -153,22 +153,21 @@
                 </header>
                 <sheet>
                     <div class="oe_title">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                    </h2>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="project_id" class="oe_edit_only"/>
+                        <h2>
+                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                        </h2>
                     </div>
                     <group>
                     <label for="date_start" string="Duration"/>
                     <div>
-                        <field name="date_start" nolabel="1" class="oe_inline"/>    -
-                        <field name="date_end" nolabel="1" class="oe_inline"/>
                         <div>
-                        <field name="duration" nolabel="1" class="oe_inline"/>
-                        <field name="product_uom" nolabel="1" class="oe_inline"/>
+                            <field name="duration" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline"/>
                         </div>
+                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
-- 
cgit v1.2.3