From b805979e924692d975ce7da4d92c3b5b20ef2dc3 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 12:31:57 +0530
Subject: [IMP]project: set one selection field and and some methods for
 followers or members

bzr revid: dbr@tinyerp.com-20120528070157-8lo7c1d3owzbmhaq
---
 addons/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 70cdac1efa0..5d2d29fb5d5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,6 +41,7 @@
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="progress_rate" widget="progressbar"/>
+                        <field name="privacy_visility"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-- 
cgit v1.2.3


From 707ece42609d2d10252f0f686f52e629e7bcea1e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 15:14:10 +0530
Subject: [IMP]project: codr improvements

bzr revid: dbr@tinyerp.com-20120528094410-2ohyzscyqh51gxt9
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5d2d29fb5d5..57c45c18856 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,7 +33,7 @@
                     <div class="oe_clear"/>
                 </div>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
+                    <group colspan="4" col="4">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="analytic_account_id" invisible="1" required="0"/>
                         <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-- 
cgit v1.2.3


From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 addons/project/project_view.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 70cdac1efa0..29704cf3318 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -600,6 +600,22 @@
                 </search>
             </field>
         </record>
+        
+        <record id="analytic_account_inherited_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<xpath expr='//group[@name="project"]' position='inside'>
+                    <field name="use_tasks" />
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">Tasks</field>
-- 
cgit v1.2.3


From 87040b2390a496a96c2c69e09cfb2f19769b1f27 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:29:34 +0530
Subject: [IMP]:project:improved project view

bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
---
 addons/project/project_view.xml | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..a7291e9f7d3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,21 +33,29 @@
                     <div class="oe_clear"/>
                 </div>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <field name="name" string="Project Name" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="progress_rate" widget="progressbar"/>-->
+                        </group>
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <table>
+                                <tr name="use_tasks">
+                                    <th width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
+                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                            </table>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
@@ -63,7 +71,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
+                        <page string="Team">
                             <field colspan="4" name="members" nolabel="1">
                                 <tree string="Members">
                                     <field name="name"/>
@@ -72,7 +80,7 @@
                             </field>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
+                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
-- 
cgit v1.2.3


From 4fc454658fdb4ed9370dcb94bb1706b3609341da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:45:41 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a7291e9f7d3..7da0277c73f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,7 +39,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
-                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
@@ -49,7 +49,7 @@
                                 <tr name="use_tasks">
                                     <th width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From 63cf0f61906dcc1726a5e4596666556975c7902c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 13:07:28 +0530
Subject: [IMP]:project:improved view and code.

bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
---
 addons/project/project_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7da0277c73f..34c228b4c53 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,10 +45,13 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table>
-                                <tr name="use_tasks">
-                                    <th width="140px">Tasks Management</th>
-                                    <td><field name="use_tasks" nolabel="1"/></td>
+                            <table border="1">
+                                <tr name="use_tasks_row">
+                                    <td>
+                                        <group class="oe_form_group_label_border">
+                                            <field name="use_tasks"/>
+                                        </group>
+                                    </td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
-- 
cgit v1.2.3


From 04d5c34200672f9f83c78bbf99593dc5e01123e2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:20:24 +0530
Subject: [IMP]:improved project view as new style and format

bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
---
 addons/project/project_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34c228b4c53..399f325667d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,13 +45,10 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table border="1">
+                            <table border="0">
                                 <tr name="use_tasks_row">
-                                    <td>
-                                        <group class="oe_form_group_label_border">
-                                            <field name="use_tasks"/>
-                                        </group>
-                                    </td>
+                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
-- 
cgit v1.2.3


From 36d176b83de7f7edbd88adfdb2e55708ea914f5d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:49:29 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530091929-i6c5vluk9osccd2a
---
 addons/project/project_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 399f325667d..2835c5f542f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,6 +11,15 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -170,15 +179,6 @@
             </field>
         </record>
         
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
-- 
cgit v1.2.3


From 41161a904c7c7ecb6872759d8c979e8a8a466c66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 16:01:59 +0530
Subject: [IMP]analytic: Add members field

bzr revid: dbr@tinyerp.com-20120530103159-n9yw01h99ap56yfw
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..847449be746 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -64,7 +64,7 @@
                             </group>
                         </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -577,6 +577,7 @@
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
+                        <field name="project_id" invisible="1"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
                             <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-- 
cgit v1.2.3


From 3b7f1698d9856eba10e46acacd5ab8bb7e0237e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 18:09:13 +0530
Subject: [IMP]project: Set members field in proper module

bzr revid: dbr@tinyerp.com-20120530123913-e7u4m3m3u6lgiop6
---
 addons/project/project_view.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 50eb9075ffc..737a4c01b02 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -621,6 +621,9 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <field name="members" colspan="4" nolabel="1"/>
+                </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>
-- 
cgit v1.2.3


From 6f42929b395b461cab5c71cbc28c2d7d58fb99a0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 18:42:17 +0530
Subject: [IMP]:improved view

bzr revid: apa@tinyerp.com-20120530131217-91o2ic0hfakl8uk7
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 737a4c01b02..8b9b6580473 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -80,9 +80,8 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
+                        <page string="Team">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
-
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -622,6 +621,7 @@
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
+                    <separator colspan="4" string="Team"/>
                     <field name="members" colspan="4" nolabel="1"/>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
-- 
cgit v1.2.3


From 498549e8e5d14f53b07cbfb7ec8181b7fc313a5d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 31 May 2012 15:03:23 +0530
Subject: [IMP]account_analytic_analysis: Inherit project form view

bzr revid: dbr@tinyerp.com-20120531093323-wks6p7arbyoam8t9
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8b9b6580473..f784c9db00b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -80,7 +80,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Team">
+                        <page name="team" string="Team">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
-- 
cgit v1.2.3


From 10ffd100e109f3f4ab91e99b0bc90831db4bb542 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 31 May 2012 15:48:45 +0530
Subject: [IMP]:improved project view

bzr revid: apa@tinyerp.com-20120531101845-ee015dc62seai6va
---
 addons/project/project_view.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f784c9db00b..5f0a1ea5944 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,9 +112,6 @@
                         <page string="Tasks Stages">
                            <field nolabel="1" name="type_ids" colspan="4"/>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="description" nolabel="1"/>
-                        </page>
                     </notebook>
                     <newline/>
                 </sheet>
-- 
cgit v1.2.3


From 18f8ec4486d729d0776cc668c168e8705cb0b42b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 1 Jun 2012 15:14:24 +0530
Subject: [IMP] project: add function to open attachments related to the
 project.

bzr revid: tpa@tinyerp.com-20120601094424-gs2k68izgcedpnx5
---
 addons/project/project_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5f0a1ea5944..d0282ded9cf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -60,6 +60,11 @@
                                     <td><field name="use_tasks" nolabel="1"/></td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
+                                <tr name="use_attachment_row">
+                                    <th style="border-right:1px solid #DDD;" width="140px">Attachment</th>
+                                    <td><field name="use_attachment" nolabel="1"/></td>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" attrs="{'invisible':[('use_attachment','=', 0)]}"/></td>
+                                </tr>
                             </table>
                         </group>
                     </group>
-- 
cgit v1.2.3


From 39e7e1320f6522fff681ef2d3fec4a12e1b934ce Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 1 Jun 2012 16:38:01 +0530
Subject: [IMP] improved code

bzr revid: tpa@tinyerp.com-20120601110801-htybml55338uhr6s
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d0282ded9cf..c7b99b43dc8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -61,9 +61,9 @@
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
-                                    <th style="border-right:1px solid #DDD;" width="140px">Attachment</th>
-                                    <td><field name="use_attachment" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" attrs="{'invisible':[('use_attachment','=', 0)]}"/></td>
+                                    <th/>
+                                    <td/>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" /></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From a704f7bd8dc5a5035609eb73a5accb1e104d86f3 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 1 Jun 2012 17:07:18 +0200
Subject: [IMP] adapt task and issue views for portal users - give read access
 rights to group_portal_member on projet.task.type and project.task.work
 models - hide action buttons and priority fields in form and list views - a
 question remains: how to handle states and stages ?  state seems more
 revelant and simple to understand for portal users (and therefore should be
 shown through the statusbar widget) while stage is more interesing for
 internal organization

bzr revid: abo@openerp.com-20120601150718-dk49583g1tko118y
---
 addons/project/project_view.xml | 72 ++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d001af367c4..ab8dcf84831 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -51,7 +51,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
+                                <field name="effective_hours" widget="float_time"/>
                                 <field name="resource_calendar_id"/>
                             </group>
                             <newline/>
@@ -128,7 +128,7 @@
                        </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
-                   <newline />
+                   <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
@@ -305,24 +305,26 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending"/>
-                        <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
-                        <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                states="pending,open,draft"/>
-                        <button name="do_cancel" string="Cancel" type="object"
-                                states="draft,open,pending" />
-                        <button name="stage_previous" string="Previous Stage" type="object"
-                                states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <button name="stage_next" string="Next Stage" type="object"
-                                states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <span groups="base.group_user">
+                            <button name="do_open" string="Start Task" type="object"
+                                    states="draft,pending"/>
+                            <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                    states="done,cancelled" context="{'button_reactivate':True}"/>
+                            <button name="do_pending" string="Pending" type="object"
+                                    states="open"/>
+                            <button name="action_close" string="Done" type="object"
+                                    states="draft,open,pending"/>
+                            <button name="do_draft" string="Draft" type="object"
+                                    states="cancel,done"/>
+                            <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
+                                    states="pending,open,draft"/>
+                            <button name="do_cancel" string="Cancel" type="object"
+                                    states="draft,open,pending"/>
+                            <button name="stage_previous" string="Previous Stage" type="object"
+                                    states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                            <button name="stage_next" string="Next Stage" type="object"
+                                    states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        </span>
                         <div class="oe_right">
                             <field name="stage_id" nolabel="1" widget="statusbar"/>
                         </div>
@@ -344,7 +346,7 @@
                                     name="planned_hours"
                                     widget="float_time"
                                     attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"									
+                                    groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field
                                     name="effective_hours"
@@ -358,10 +360,10 @@
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="name" />
+                                    <field name="name"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
-                                    <field name="user_id" />
-                                    <field name="date" />
+                                    <field name="user_id"/>
+                                    <field name="date"/>
                                 </tree>
                             </field>
                         </page>
@@ -386,13 +388,13 @@
                         <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
                             <group colspan="2" col="2">
                                 <separator string="Planning" colspan="2"/>
-                                <field name="priority"/>
+                                <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
 
                             <separator string="Miscellaneous" colspan="4"/>
-                            <field name="partner_id" />
+                            <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="state" groups="base.group_no_one"/>
                             <separator colspan="4" string="Notes"/>
@@ -415,7 +417,7 @@
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
-                    <field name="priority"/>
+                    <field name="priority" groups="base.group_user"/>
                     <field name="stage_id"/>
                     <field name="user_id"/>
                     <field name="user_email"/>
@@ -518,16 +520,18 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <button name="do_open" string="Start Task" type="object"
-                            states="draft,pending" icon="gtk-go-forward"/>
+                            states="draft,pending" icon="gtk-go-forward" groups="base.group_user"/>
                     <button name="action_close" string="Done" type="object"
-                            states="draft,open,pending" icon="gtk-apply"/>
+                            states="draft,open,pending" icon="gtk-apply" groups="base.group_user"/>
                     <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                            states="pending,open,draft" icon="terp-personal"/>
+                            states="pending,open,draft" icon="terp-personal" groups="base.group_user"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
                     <button name="stage_previous" string="Previous Stage" type="object"
-                            states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                            states="open,pending" icon="gtk-go-back" 
+                            attrs="{'invisible': [('stage_id','=', False)]}" groups="base.group_user"/>
                     <button name="stage_next" string="Next Stage" type="object"
-                            states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                            states="open,pending" icon="gtk-go-forward" 
+                            attrs="{'invisible': [('stage_id','=', False)]}" groups="base.group_user"/>
                     <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
@@ -589,8 +593,8 @@
                         <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
+                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
                         </field>
                     </group>
                     <newline/>
-- 
cgit v1.2.3


From be2bee253f69dc0609436e127f11eb7f86746720 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Jun 2012 14:28:59 +0530
Subject: [IMP]project: set attrs on team tab

bzr revid: dbr@tinyerp.com-20120604085859-j4ocx0qkrimwpf7c
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6710e455cb6..7cc57ba3ad9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -86,7 +86,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page name="team" string="Team">
+                        <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
-- 
cgit v1.2.3


From e7f5c1088bbdcaee6a48fe534ec7501ff858c3d5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 16:03:42 +0530
Subject: [IMP]type invible when type is contract and template and project
 related issues solved

bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6710e455cb6..ad7474b7d40 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -625,7 +625,7 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1"/>
+                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From f5c7e060b888be686e94f6badac003d698337812 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 4 Jun 2012 16:21:29 +0530
Subject: [IMP]:improved view code

bzr revid: apa@tinyerp.com-20120604105129-zlbaoej3qj4kdpbo
---
 addons/project/project_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9559481fa49..8d34084d9b9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -633,8 +633,10 @@
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
-                    <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
+                    <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
+                        <separator colspan="4" string="Team"/>
+                        <field name="members" colspan="4" nolabel="1"/>
+                    </group>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From 3511620380243eb62d16c35209dbe77a2df92de4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 6 Jun 2012 17:25:26 +0200
Subject: [IMP] after having the portal module tested on the runbot with a
 db_all, adjust some of the rights and add several 'groups' attributes

bzr revid: abo@openerp.com-20120606152526-zkfskd3xa2cdb22c
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c8883906fb0..374bb357ff5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -348,7 +348,7 @@
                             </group>
                             <group col="3" colspan="2">
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit" groups="project.group_time_work_estimation_tasks"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
-- 
cgit v1.2.3


From 1918bb0a069617d0cd8470bdd5d98e6ba363ab7d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:15:29 +0530
Subject: [IMP]project: Set privacy_visibility instead of privacy_visility.

bzr revid: dbr@tinyerp.com-20120607054529-n7sigtg2a5y6zg1i
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e6c160dac8f..7f8f34df2ce 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                            <field name="privacy_visility"/>
+                            <field name="privacy_visibility"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
-- 
cgit v1.2.3


From a36b500424f923ee2638b237b79002a1db141a76 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 11:28:47 +0530
Subject: [IMP]:analytic,project:the validity and project sections are on the
 same line.

bzr revid: apa@tinyerp.com-20120607055847-12hq1p2fnalr0xs8
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e6c160dac8f..613461e0440 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -627,12 +627,12 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
-                <xpath expr='//separator[@name="description"]' position='before'>
+<!--                <xpath expr='//separator[@name="description"]' position='before'>
                     <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
                         <separator colspan="4" string="Team"/>
                         <field name="members" colspan="4" nolabel="1"/>
                     </group>
-                </xpath>
+                </xpath>-->
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>
-- 
cgit v1.2.3


From 2ce7c4e329e1b1aea9bd117c7798898a18369c4b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 13:02:25 +0530
Subject: [FIX]project: members field remove from .py but not from .xml so now
 remove

bzr revid: dbr@tinyerp.com-20120607073225-hdvwrcd8avtdxx0g
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f8f34df2ce..d91c412b11c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -630,7 +630,7 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
                         <separator colspan="4" string="Team"/>
-                        <field name="members" colspan="4" nolabel="1"/>
+                        <!--<field name="members" colspan="4" nolabel="1"/>-->
                     </group>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 35a976f2169..e521654e5a7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -56,12 +56,12 @@
                                 <tr name="use_tasks_row">
                                     <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-stock_align_left_24" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
                                     <th/>
                                     <td/>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                    <td style="text-align:right;" width="110px"><button icon="gtk-dnd-multiple" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From dbf72709e866ea562be10c68ef189342ac5574b1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 16:41:17 +0530
Subject: [FIX]:in project, there is twice a configuration / stages menuitem:
 one for claim stages and another for task stages. Both should be under the
 same menuitem

bzr revid: apa@tinyerp.com-20120612111117-xm1ikdpvcp8rzno6
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 36d49382f7f..25d1158be68 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -10,7 +10,7 @@
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
@@ -768,11 +768,11 @@
             <field name="help">Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
-- 
cgit v1.2.3


From 38b84e8411d9f877cacd3a1e97a180906c5d22ef Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 17:04:46 +0530
Subject: [IMP]:project:improved project view and removed commented code.

bzr revid: apa@tinyerp.com-20120612113446-7vn1yfbg81vusc97
---
 addons/project/project_view.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 25d1158be68..962b858094c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -47,9 +47,6 @@
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
-                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
-                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
-                            <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
                             <table border="0">
@@ -67,7 +64,7 @@
                         </group>
                     </group>
                     <notebook colspan="4">
-                        <page string="Members">
+                        <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
                             <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
@@ -102,16 +99,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
-                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
-                                <tree string="Members">
-                                    <field name="name"/>
-                                    <field name="user_email"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
-- 
cgit v1.2.3


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/project_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb875b9dc60..a65db02d0d6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,12 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -326,15 +327,15 @@
                 <form string="Project" version="7.0">
                     <header>
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending"/>
+                                states="draft,pending" class="oe_form_button_active_flow"/>
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
+                                states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
+                                states="open" class="oe_form_button_active_flow"/>
                         <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
+                                states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
+                                states="cancel,done" class="oe_form_button_return_flow"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
-- 
cgit v1.2.3


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

bzr revid: tpa@tinyerp.com-20120614130147-mf89jyc3lqote1br
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a65db02d0d6..e25fdc4f969 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -23,7 +23,7 @@
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
@@ -331,7 +331,7 @@
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_form_button_return_flow"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
-- 
cgit v1.2.3


From 66c3093feef8df9c21f34fa1aea402087dd3c7ea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:12:54 +0200
Subject: [IMP] contract management: misc improvements

bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f30ba027040..542ae3d085b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -53,12 +53,12 @@
                                 <tr name="use_tasks_row">
                                     <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-stock_align_left_24" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
                                     <th/>
                                     <td/>
-                                    <td style="text-align:right;" width="110px"><button icon="gtk-dnd-multiple" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
                                 </tr>
                             </table>
                         </group>
@@ -636,9 +636,9 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project" name="project_sep"/>
+                    <separator colspan="2" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
                 </xpath>
-            	<xpath expr='//group[@name="project"]' position='inside'>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_tasks" />
                 </xpath>
             </field>
-- 
cgit v1.2.3


From bde7606b5b531526bde11e0124975f1836aec0b0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 14:59:18 +0200
Subject: [REM] project: removal of warn_manager and warn_customer features
 that are now handled by the chatter

bzr revid: qdp-launchpad@openerp.com-20120615125918-zaiickzw4yuudqkj
---
 addons/project/project_view.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 542ae3d085b..41bcef24f4f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -84,31 +84,19 @@
                             </field>
                         </page>
                         <page string="Administration">
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Performance"/>
+                            <group string="Administration">
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
                                 <field name="resource_calendar_id"/>
                             </group>
-                            <newline/>
-                            <group col="2" colspan="2" name="misc">
-                                <separator colspan="4" string="Miscellaneous"/>
+                            <group string="Miscellaneous" name="misc">
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="warn_manager"/>
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <newline/>
-                            <group colspan="4" col="4">
-                                <separator colspan="2" string="Mail Header"/>
-                                <separator colspan="2" string="Mail Footer"/>
-                                <field name="warn_header" nolabel="1" colspan="2"/>
-                                <field name="warn_footer" nolabel="1" colspan="2"/>
-                            </group>
                             <group col="3">
                                 <b>
                                     <label string="Variables you can use for headers and footer." colspan="3"/>
-- 
cgit v1.2.3


From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 15:10:56 +0200
Subject: [IMP] contract management: misc code cleaning and improvements

bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33
---
 addons/project/project_view.xml | 54 ++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 41bcef24f4f..28a5b35c2f5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,34 +38,33 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" layout="auto">
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <field name="name" string="Project Name" select="1"/>
+                <sheet string="Project">
+                    <group>
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1>
+                            <field name="name" string="Project Name"/>
+                        </h1>
+                        <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
                         </group>
-                        <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table border="0">
-                                <tr name="use_tasks_row">
-                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
-                                    <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <th/>
-                                    <td/>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
-                                </tr>
-                            </table>
+                        <group col="4">
+                            <group>
+                                <label string=""/>
+                                <field name="use_tasks"/>
+                            </group>
+                            <group>
+                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/>
+                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                            </group>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
-                            <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
+                            <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
                                     <templates>
@@ -94,19 +93,8 @@
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
-                        </page>
-                        <page string="Billing" groups="account.group_account_invoice">
-                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <group col="3">
-                                <b>
-                                    <label string="Variables you can use for headers and footer." colspan="3"/>
-                                </b>
-                                <label string="Task: %%(name)s"/>
-                                <label string="User: %%(user_id)s"/>
-                                <label string="ID: %%(task_id)s"/>
-                                <label string="Status: %%(state)s"/>
-                                <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date)s"/>
+                            <group string="Billing" groups="account.group_account_invoice">
+                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             </group>
                         </page>
                         <page string="Tasks Stages">
-- 
cgit v1.2.3


From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:48:35 +0200
Subject: [IMP] project: version 7.0 for the project form view

bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
---
 addons/project/project_view.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 28a5b35c2f5..40402799616 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,11 +39,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" string="Project Name"/>
+                    </h1>
                     <group>
-                        <label for="name" class="oe_form_readonly_hidden"/>
-                        <h1>
-                            <field name="name" string="Project Name"/>
-                        </h1>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -51,19 +51,21 @@
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
                         </group>
-                        <group col="4">
-                            <group>
-                                <label string=""/>
-                                <field name="use_tasks"/>
-                            </group>
-                            <group>
-                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/>
-                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
-                            </group>
+                        <group>
+                            <table>
+                                <tr name="use_tasks_row">
+                                    <td><group><field name="use_tasks"/></group></td>
+                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <td/>
+                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
                         </group>
                     </group>
                     <notebook>
-                        <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
+                        <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
-- 
cgit v1.2.3


From d23a4ad38d5ff08303177a6e8c9a9bd0f97fa51b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:52:20 +0200
Subject: [IMP] project: usabiltiy improvement

bzr revid: qdp-launchpad@openerp.com-20120615145220-a08228oqpf7thb5m
---
 addons/project/project_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 40402799616..d94c5b588a3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -84,7 +84,7 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page string="Administration">
+                        <page string="Other Info">
                             <group string="Administration">
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
@@ -94,8 +94,6 @@
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                            </group>
-                            <group string="Billing" groups="account.group_account_invoice">
                                 <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             </group>
                         </page>
-- 
cgit v1.2.3


From ff519229291957074cc7875a8eb96c8822dbe9c1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:19:19 +0200
Subject: [IMP] usability imp

bzr revid: qdp-launchpad@openerp.com-20120615151919-a1yisdlk672ehqft
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d94c5b588a3..30f0db38497 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -612,7 +612,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
                 </xpath>
                 <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From 9a6036f38d9494c5c82656b49c537ffb5be6f4f2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:25:44 +0200
Subject: [FIX+IMP]  project_timesheet:fixed bad reference; project= usabilty
 improvements

bzr revid: qdp-launchpad@openerp.com-20120615152544-yy9zdx3pxeyol4bc
---
 addons/project/project_view.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 30f0db38497..86a744a87ba 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -85,16 +85,18 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group string="Administration">
-                                <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="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="priority"/>
-                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                            <group>
+                                <group string="Administration">
+                                    <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="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="priority"/>
+                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Tasks Stages">
-- 
cgit v1.2.3


From 23fc5392e6613eea565f4006bd0b6643b19ccfd8 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 19 Jun 2012 19:02:23 +0530
Subject: [FIX] : Fix css class color on button issue

bzr revid: aja@tinyerp.com-20120619133223-mmu2hn9oa4utzwqx
---
 addons/project/project_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index dea62b4d690..7458276fd8c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -333,9 +333,13 @@
                                 states="cancel,done" class="oe_form_button_return_flow"/>
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                                states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_form_button_active_flow"/>
+                        <button name="action_close" string="Done" type="object"
+                                states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
                                 states="open" class="oe_form_button_return_flow"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-- 
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/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7458276fd8c..f68a901d4dd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
                     <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -328,16 +328,16 @@
                     <header>
                         <!--
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_form_button_active_flow"/>
+                                states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
                                 states="cancel,done" class="oe_form_button_return_flow"/>
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                                states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_highlight"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
-- 
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/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b1be15caf88..320be4fcb2d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -22,8 +22,8 @@
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
+                    <button name="set_pending" string="Pending" type="object" states="open" />
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@@ -332,7 +332,7 @@
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done" class="oe_form_button_return_flow"/>
+                                states="cancel,done" />
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
@@ -343,7 +343,7 @@
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_return_flow"/>
+                                states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
-- 
cgit v1.2.3


From 0a48c466554b587fea8ab4cd1c77a871fe7fdb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 22 Jun 2012 12:56:46 +0200
Subject: [IMP] project_issue, project, event, hr_holidays: added Inbox filter.

bzr revid: tde@openerp.com-20120622105646-hmsxe62xcul2mxeq
---
 addons/project/project_view.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7588de7348f..ab2f4335949 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,6 +133,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                        <filter icon="terp-mail-message-new"
+                            string="Inbox" help="Unread messages"
+                            name="needaction_pending"
+                            domain="[('needaction_pending','=',True)]"/>
+                        <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
                        <filter icon="gtk-media-pause" string="Template"
@@ -446,6 +451,8 @@
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
+                    <field name="message_summary"/>
+                    <field name="needaction_pending"/>
                     <templates>
                         <t t-name="task_details">
                             <ul class="oe_kanban_tooltip" t-if="record.project_id.raw_value">
@@ -591,6 +598,11 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <filter icon="terp-mail-message-new"
+                            string="Inbox" help="Unread messages"
+                            name="needaction_pending"
+                            domain="[('needaction_pending','=',True)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-- 
cgit v1.2.3


From 451b05e68d4fe96ca0d7bfbf850ce0528df925fa Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 25 Jun 2012 11:20:39 +0530
Subject: [FIX] Task done button CSS Imp

bzr revid: jam@tinyerp.com-20120625055039-05bo1r5c0x6lqsbb
---
 addons/project/project_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b077a7bd725..499fc1938b2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -337,9 +337,7 @@
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open" class="oe_highlight"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,pending" />        
+                                states="open,draft,pending" class="oe_highlight"/>
                         <button name="do_pending" string="Pending" type="object"
                                 states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-- 
cgit v1.2.3


From ef87129d694e56ccd6bb874482769bf845dfd532 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 10:43:13 +0200
Subject: [IMP] project: simplify code and improve res.company inherited view

bzr revid: rco@openerp.com-20120625084313-atvbr3hc8940whtt
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f883f007bd6..84c65777e95 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -750,9 +750,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    <newline/>
+                    <group string="Project Management">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </page>
             </field>
         </record>
-- 
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/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 499fc1938b2..e45216685ff 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" />
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
                     <button name="set_pending" string="Pending" type="object" states="open" />
@@ -337,7 +337,7 @@
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open,draft,pending" class="oe_highlight"/>
+                                states="open,draft,pending" />
                         <button name="do_pending" string="Pending" type="object"
                                 states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-- 
cgit v1.2.3


From 6c879adbaebe0817cc1fac6edef699aa96539a0e Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 26 Jun 2012 17:27:00 +0530
Subject: [IMP] kanban project.task

bzr revid: tta@openerp.com-20120626115700-2ssby2yt15oaodmx
---
 addons/project/project_view.xml | 128 +++++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 67 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index be4421f126b..a3308f5e4cd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -445,76 +445,70 @@
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
-                    <templates>
-                        <t t-name="task_details">
-                            <ul class="oe_kanban_tooltip" t-if="record.project_id.raw_value">
-                                <li><b>Project:</b> <field name="project_id"/></li>
-                            </ul>
-                        </t>
-                        <t t-name="kanban-box">
-                            <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
-                            <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
-                            <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                    <tr>
-                                        <td align="left" valign="middle" width="16">
-                                            <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                        </td>
-                                        <td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
-                                            <field name="name"/>
-                                        </td>
-                                        <td valign="top" width="22">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
-                                            width="22" height="22" class="oe_kanban_gravatar"/>
-                                        </td>
-                                    </tr>
-                                    </table>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <div class="oe_kanban_description">
-                                            <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
-                                            <i t-if="record.date_deadline.raw_value">
-                                                <t t-if="record.description.raw_value">, </t>
-                                                <field name="date_deadline"/>
-                                            </i>
-                                            <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
-                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
-                                                <t t-set="times" t-value="[
-                                                     [1, (hours gte 1 and hours lt 2)]
-                                                    ,[2, (hours gte 2 and hours lt 5)]
-                                                    ,[5, (hours gte 5 and hours lt 10)]
-                                                    ,[10, (hours gte 10)]
-                                                ]"/>
-                                                <t t-foreach="times" t-as="time"
-                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
-                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
-                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
-                                                ></t>
-                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
-                                            </span>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                            <a name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                                            <a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                                        </div>
-                                        <div class="oe_kanban_right">
-                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
-                                            <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
-                                            <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
+                    <templates>                    
+                    <t t-name="kanban-box">
+                        <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
+                        <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
+                        <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <span class="oe_e">i</span>
+                                <ul class="oe_dropdown_menu">
+                                    <li><a type="edit" >Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li><a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object">Mark as Blocked</a></li>
+                                    <li><a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object">Normal</a></li>
+                                    <li><a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object">Done</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>                                    
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <b><field name="name"/></b>                                     
+                                </div>
+                                <div>
+                                    <field name="partner_id"/>                   
+                                </div>                                 
+                                <div>
+                                    <field name="project_id"/>
+                                </div> 
+                                <div class="oe_kanban_footer_left">
+                                    <div class="oe_right">
+                                    <span class="oe_kanban_highlight">
+                                            <t t-set="priority" t-value="record.priority.raw_value || 5"/>
+                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Medium Priority">
+                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['2']" t-if="priority lte 3" title="Medium Priority">
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['1']" title="High Priority"> 
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['0']" title="Highest Priority">
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 0 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                         </span>
+                                    <!--
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
+                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
+                                    -->
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                 </div>
                             </div>
-                        </t>
-                    </templates>
+                            <div class="oe_clear"></div>
+                        </div>
+                        <!--
+                            <div class="oe_kanban_right">
+                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
+                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
+                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
+                            </div>
+                        -->
+                    </t>
+                </templates>
                 </kanban>
             </field>
          </record>
-- 
cgit v1.2.3


From 10f024ecb66d7b0c3d24105b39efc20376381d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 26 Jun 2012 14:00:13 +0200
Subject: [IMP] crm_meeting, crm_phonecall, sale, project, hr_holidays, event,
 purchase: added server actions for (un)read.

bzr revid: tde@openerp.com-20120626120013-zhcea1fdyaltogq1
---
 addons/project/project_view.xml | 75 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bee3236dbd3..6cebd16d867 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -12,6 +12,43 @@
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
+        <!-- Project Read/Unread actions -->
+        <record id="actions_server_project_unread" model="ir.actions.server">
+            <field name="name">Mark unread</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_unread" model="ir.values">
+            <field name="name">action_project_unread</field>
+            <field name="action_id" ref="actions_server_project_unread"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_unread'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_project" />
+            <field name="model">project.project</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
+        <record id="actions_server_project_read" model="ir.actions.server">
+            <field name="name">Mark read</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_read" model="ir.values">
+            <field name="name">action_project_read</field>
+            <field name="action_id" ref="actions_server_project_read"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_read'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_project" />
+            <field name="model">project.project</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -322,6 +359,44 @@
         </record>
 
         <!-- Task -->
+
+        <!-- Task Read/Unread actions -->
+        <record id="actions_server_project_task_unread" model="ir.actions.server">
+            <field name="name">Mark unread</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_task_unread" model="ir.values">
+            <field name="name">action_project_task_unread</field>
+            <field name="action_id" ref="actions_server_project_task_unread"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_unread'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_task" />
+            <field name="model">project.task</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
+        <record id="actions_server_project_task_read" model="ir.actions.server">
+            <field name="name">Mark read</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_task_read" model="ir.values">
+            <field name="name">action_project_task_read</field>
+            <field name="action_id" ref="actions_server_project_task_read"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_read'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_task" />
+            <field name="model">project.task</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
-- 
cgit v1.2.3


From 788748604fcbb9eda51cb61bf400072d58272fd3 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 27 Jun 2012 16:06:10 +0530
Subject: [IMP] kanban : project.task, project.issue, hr.applicant

bzr revid: tta@openerp.com-20120627103610-1uwuz2geen0psq5j
---
 addons/project/project_view.xml | 53 ++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a3308f5e4cd..5ece80fc646 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -455,15 +455,15 @@
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object">Mark as Blocked</a></li>
-                                    <li><a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object">Normal</a></li>
-                                    <li><a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object">Done</a></li>
+                                    <li><a type="delete">Delete</a></li>                                   
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>                                    
                                 </ul>
                             </div>
                             <div class="oe_kanban_content">
                                 <div>
+                                    
+                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
                                     <b><field name="name"/></b>                                     
                                 </div>
                                 <div>
@@ -471,29 +471,32 @@
                                 </div>                                 
                                 <div>
                                     <field name="project_id"/>
+                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
+                                    <i><field name="date_deadline"/></i>
+                                    <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
+                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
+                                                <t t-set="times" t-value="[
+                                                     [1, (hours gte 1 and hours lt 2)]
+                                                    ,[2, (hours gte 2 and hours lt 5)]
+                                                    ,[5, (hours gte 5 and hours lt 10)]
+                                                    ,[10, (hours gte 10)]
+                                                ]"/>
+                                                <t t-foreach="times" t-as="time"
+                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
+                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
+                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
+                                                ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
+                                    </span>
                                 </div> 
-                                <div class="oe_kanban_footer_left">
+                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
+                                    <div class="oe_left">
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>                                    
+                                    </div>
                                     <div class="oe_right">
-                                    <span class="oe_kanban_highlight">
-                                            <t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Medium Priority">
-                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['2']" t-if="priority lte 3" title="Medium Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['1']" title="High Priority"> 
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 1 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['0']" title="Highest Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 0 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                         </span>
-                                    <!--
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
-                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
-                                    -->
-                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                    <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
+                                    <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
+                                    <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
                                     </div>
                                 </div>
                             </div>
-- 
cgit v1.2.3


From 7ed6f5052db5e76d3e5bbf49f086121ee40b82f2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:36 +0530
Subject: [IMP]remove all select=1 and select=2

bzr revid: sgo@tinyerp.com-20120628061736-ujwe0swulvrcrkjt
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7d3f595e2c5..97b051426f8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -50,7 +50,7 @@
                     </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
@@ -97,10 +97,10 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="company_id"  groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                                    <field name="currency_id"  groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From 1b87acc3f498e3cbe67cc84bdaa6ad1b4d3afd02 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:53:43 +0530
Subject: [IMP]remove layout option from sheet

bzr revid: sgo@tinyerp.com-20120628062343-7xbs4bvyivnhergs
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 97b051426f8..c12ed792bd5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,7 +38,7 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" layout="auto">
+                <sheet string="Project" >
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
-- 
cgit v1.2.3


From 46f2c2c9ca8662de3c1c8fc79fbdb1355367bc49 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 28 Jun 2012 14:18:20 +0200
Subject: [IMP] improvements during code review

bzr revid: qdp-launchpad@openerp.com-20120628121820-r8bxfzq38fy8pcgt
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c12ed792bd5..9da977e44d7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,7 +38,7 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" >
+                <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
@@ -50,7 +50,7 @@
                     </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
@@ -97,10 +97,10 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id"  groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id"  groups="base.group_multi_company" required="1"/>
+                                    <field name="currency_id" groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From 7416e2443fb3b45900c787959bff354e4bfe66bd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 11:32:56 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
---
 addons/project/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f35354b94f..5e4f758e439 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -29,10 +29,10 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" />
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
-                    <button name="set_pending" string="Pending" type="object" states="open" />
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@@ -321,20 +321,20 @@
                             <button name="do_open" string="Start Task" type="object"
                                     states="draft,pending" class="oe_highlight"/>
                             <button name="do_draft" string="Draft" type="object"
-                                    states="cancel,done" />
+                                    states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
                              <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                     states="cancelled" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="open,draft,pending" />
+                                    states="draft,open,pending"/>
                             <button name="do_pending" string="Pending" type="object"
-                                    states="open" />
+                                    states="open"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                     states="pending,open,draft" groups="project.group_delegate_task"/>
                             <button name="do_cancel" string="Cancel" type="object"
-                                    states="draft,open,pending" />
+                                    states="draft,open,pending"/>
                             <button name="stage_previous" string="Previous Stage" type="object"
                                     states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
                             <button name="stage_next" string="Next Stage" type="object"
-- 
cgit v1.2.3


From 27a1ac68d4443dfd08f8b15141716a8c98098faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Jul 2012 14:41:11 +0200
Subject: [REF] ThreadView widget renamed to mail_thread. Also added some
 footers where they were not used.

bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cf501740456..f18cfe4b682 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -148,7 +148,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -496,7 +496,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
-- 
cgit v1.2.3