From 1165b5122b2b76792bf23685712a14d747956cad Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 17 Dec 2012 18:37:06 +0530
Subject: [IMP]Improve Code

bzr revid: vja@tinyerp.com-20121217130706-0xkms3vltsdzd9nq
---
 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 499ebc3e2c5..712d1ba558c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -75,6 +75,7 @@
                                             <div style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                     <div class="oe_module_desc">
                                                         <field name="name"/>
                                                     </div>
-- 
cgit v1.2.3


From ecbcbdfbb6f830df3896a1b9dc194c1f404c845a Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 4 Apr 2013 12:04:57 +0200
Subject: [FIX] Progress rate visibility not an issue in trunk

bzr revid: jco@openerp.com-20130404100457-5jm3e37ilatoto2n
---
 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 16dbe44ccc1..dd51f9d6acf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -99,7 +99,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="privacy_visibility"/>
+                            <field name="privacy_visibility" widget="radio"/>
                             <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-- 
cgit v1.2.3


From 4bb708e79e4cdd8b6c06fbdf670b8204ac050093 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 9 Apr 2013 11:25:07 +0530
Subject: [IMP] Added action for the *Issues* button in Customers form view. On
 clicking the *Claims* button in Customer form view it is showing the filter
 like 'Partner' so made it as 'Customer' Added field Partner_id in search view
 of Project.

bzr revid: psa@tinyerp.com-20130409055507-7v15i2hppum0exoz
---
 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 a016c46e0e0..fbc06bb0416 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,6 +32,7 @@
                     <separator/>
                     <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+"/>
+                    <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-- 
cgit v1.2.3


From 9cd15d72167710b4319f551817c0665e0a098f55 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 9 Apr 2013 15:53:39 +0530
Subject: [IMP] Removed the action and inherited searchview for adding
 partner_id

bzr revid: psa@tinyerp.com-20130409102339-c2pyba8qpzm6vjkj
---
 addons/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fbc06bb0416..a016c46e0e0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,7 +32,6 @@
                     <separator/>
                     <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+"/>
-                    <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-- 
cgit v1.2.3


From a3de5c872f7c26ec085dc62b95cfc62382ab970a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Apr 2013 13:11:58 +0200
Subject: [REF] [IMP] mail_alias improvement alias_name is not required anymore
 crm, hr_job, project, mail_group, res_users: alias creation is now different
 and done more like other inherits, except an alias_model_name that is given
 to the context to find the alias alias_model_id. crm, jr_job, project,
 mail_group, res_users: updated form views using aliases mail_alias: added a
 filter on 'inactive' aliases (alias_name False) and added a button to
 redirect to the related document if any

bzr revid: tde@openerp.com-20130409111158-bv04n5o01z9l3c17
---
 addons/project/project_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a016c46e0e0..5a1f03823a2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -89,16 +89,16 @@
                             <field name="name" string="Project Name"/>
                         </h1>
                         <div name="group_alias"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <label for="alias_id" string="Email Alias"/>
-                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                        <span name="edit_alias" class="oe_edit_only">
-                            <field name="alias_name" class="oe_inline"
-                                    attrs="{'required': [('alias_id', '!=', False)]}"/>
-                            @
-                            <field name="alias_domain" class="oe_inline" readonly="1"/>
-                        </span>
-                    </div>
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <span name="read_alias" class="oe_read_only" attrs="{'invisible': [('alias_name', '=', False)]}">
+                                <span class="oe_e oe_e_alias">%%</span>
+                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                            </span>
+                            <span name="edit_alias" class="oe_edit_only">
+                                <span class="oe_e oe_e_alias">%%</span>
+                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            </span>
+                        </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
                             <label for="use_tasks"/>
@@ -251,7 +251,7 @@
                                 <div class="oe_kanban_content">
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_alias" t-if="record.alias_id.value">
-                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                        <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> 
-- 
cgit v1.2.3


From 3519e2c19f90002555163c7bae1bd07e14510e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Apr 2013 18:01:39 +0200
Subject: [IMP] project, task, issues: improvement of ir rules. Still a bit
 WIP.

bzr revid: tde@openerp.com-20130410160139-vx9z4rsmfiji1vu9
---
 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 75d508f63fb..58ae4de1b6f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -111,7 +111,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="privacy_visibility" widget="radio"/>
+                            <field name="visibility" widget="radio"/>
                             <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-- 
cgit v1.2.3


From eb1ede2367ab8bf6bfa62dcdafa13e7eb1bfb0e1 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 12 Apr 2013 13:55:00 +0530
Subject: [IMP] Improved code of Meetings buttons in Customers form view which
 is showing 'id' of Customer. Removed unwanted code of views and action and
 used older actions.

bzr revid: psa@tinyerp.com-20130412082500-xf96csxd5unz66cr
---
 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 a016c46e0e0..fbc06bb0416 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,6 +32,7 @@
                     <separator/>
                     <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+"/>
+                    <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-- 
cgit v1.2.3


From a91274c18c4a30c8191b8af72636dd2ad6d9b345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 16 Apr 2013 16:29:01 +0200
Subject: [IMP] project, mail_group, hr_job, sales team: added alias_contact
 parameter in form view. Also fixed a typo in project form view about
 visilibity -> privacy_visibility.

bzr revid: tde@openerp.com-20130416142901-c6wbc82yp2kwj1dt
---
 addons/project/project_view.xml | 4 +++-
 1 file changed, 3 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 58ae4de1b6f..c66d270438d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -98,6 +98,8 @@
                                 <span class="oe_e oe_e_alias">%%</span>
                                 <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                             </span>
+                            <span class="oe_e oe_e_alias">V</span>
+                            <field name="alias_contact" class="oe_inline"/>
                         </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
@@ -111,7 +113,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="visibility" widget="radio"/>
+                            <field name="privacy_visibility" widget="radio"/>
                             <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-- 
cgit v1.2.3


From a5bb69ec28bad2d86f5559d377862f0f77744f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 May 2013 11:36:36 +0200
Subject: [IMP] project: improved privacy_visiliby options labels, improved
 form view according to new specs.

bzr revid: tde@openerp.com-20130507093636-gk9k1rc52u3ats3a
---
 addons/project/project_view.xml | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 2c03445b900..0363aa0a7c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -88,19 +88,6 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
-                        <div name="group_alias"
-                                attrs="{'invisible': [('alias_domain', '=', False)]}">
-                            <span name="read_alias" class="oe_read_only" attrs="{'invisible': [('alias_name', '=', False)]}">
-                                <span class="oe_e oe_e_alias">%%</span>
-                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                            </span>
-                            <span name="edit_alias" class="oe_edit_only">
-                                <span class="oe_e oe_e_alias">%%</span>
-                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                            </span>
-                            <span class="oe_e oe_e_alias">V</span>
-                            <field name="alias_contact" class="oe_inline"/>
-                        </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
                             <label for="use_tasks"/>
@@ -112,18 +99,23 @@
                         <button name="attachment_tree_view" string="Documents" type="object"/>
                     </div>
                     <group>
-                        <group>
-                            <field name="privacy_visibility" widget="radio"/>
-                            <field name="user_id" string="Project Manager" 
+                        <group colspan="2"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <field name="privacy_visibility" widget="radio"/>
+                                <field name="alias_id" class="oe_read_only" string="Email Alias"/>
+                                <label for="alias_name" string="Email Alias" class="oe_edit_only"/>
+                                <div class="oe_edit_only">
+                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </div>
+                                <field name="alias_contact" class="oe_inline"/>
+                        </group>
+                        <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-                        </group>
-                        <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
-                                To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
-                            </p>
-                        </group>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                            To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
+                        </p>
                     </group>
                     <notebook>
                         <page string="Team" name="team">
-- 
cgit v1.2.3


From 93a112e9f2c06ff05aec3f546408a479681249e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 May 2013 14:22:23 +0200
Subject: [IMP] hr, res_users, project, mail_group: improved form view about
 aliases, following new specs.

bzr revid: tde@openerp.com-20130507122223-scy54ukfdndtj2d8
---
 addons/project/project_view.xml | 14 ++++++++------
 1 file changed, 8 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 0363aa0a7c7..3d3ff6e524d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -99,15 +99,17 @@
                         <button name="attachment_tree_view" string="Documents" type="object"/>
                     </div>
                     <group>
-                        <group colspan="2"
+                        <group colspan="2" name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <field name="privacy_visibility" widget="radio"/>
-                                <field name="alias_id" class="oe_read_only" string="Email Alias"/>
-                                <label for="alias_name" string="Email Alias" class="oe_edit_only"/>
-                                <div class="oe_edit_only">
+                            <field name="privacy_visibility" widget="radio"/>
+                            <label for="alias_name" string="Email Alias"/>
+                            <div name="alias_def">
+                                <field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"/>
+                                <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
                                     <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                                 </div>
-                                <field name="alias_contact" class="oe_inline"/>
+                            </div>
+                            <field name="alias_contact" class="oe_inline"/>
                         </group>
                         <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
-- 
cgit v1.2.3


From 0dd63979ddfedb0ebfe5cb833e38afe9b9e1f573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 May 2013 15:02:30 +0200
Subject: [IMP] project: improved form view about aliases

bzr revid: tde@openerp.com-20130507130230-b33sq453m62q358i
---
 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 3d3ff6e524d..1f980e659b3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -109,7 +109,8 @@
                                     <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                                 </div>
                             </div>
-                            <field name="alias_contact" class="oe_inline"/>
+                            <field name="alias_contact" class="oe_inline"
+                                    attrs="{'invisible': [('alias_name', '=', False)]}"/>
                         </group>
                         <field name="user_id" string="Project Manager" 
                                 attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
-- 
cgit v1.2.3


From 6d06f75efc308176ff57d5d2c359567d39b5f828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 10 May 2013 12:21:47 +0200
Subject: [IMP] project, hr, crm: improved form views about email aliases...
 another iteration of improvement.

bzr revid: tde@openerp.com-20130510102147-fq98n6qf88a45ti0
---
 addons/project/project_view.xml | 58 +++++++++++++++++++++++------------------
 1 file changed, 33 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 1f980e659b3..303808463fb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -99,26 +99,32 @@
                         <button name="attachment_tree_view" string="Documents" type="object"/>
                     </div>
                     <group>
-                        <group colspan="2" name="group_alias"
+                        <group>
+                            <field name="user_id" string="Project Manager" 
+                                    attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
+                                    context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                            <span></span>
+                            <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract:
+                                <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
+                            </p>
+                        </group>
+                        <group name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
-                            <field name="privacy_visibility" widget="radio"/>
                             <label for="alias_name" string="Email Alias"/>
                             <div name="alias_def">
-                                <field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"/>
+                                <field name="alias_id" class="oe_read_only oe_inline"
+                                        string="Email Alias" required="0"/>
                                 <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
                                     <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                                 </div>
                             </div>
+                            <label for="alias_model" string="Incoming Emails create"/>
+                            <field name="alias_model" class="oe_inline" nolabel="1"/>
                             <field name="alias_contact" class="oe_inline"
-                                    attrs="{'invisible': [('alias_name', '=', False)]}"/>
+                                    string="Accept Emails From"/>
                         </group>
-                        <field name="user_id" string="Project Manager" 
-                                attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
-                                context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                        <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
-                            To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
-                        </p>
                     </group>
                     <notebook>
                         <page string="Team" name="team">
@@ -141,20 +147,22 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group>
-                                <group string="Administration" groups="project.group_time_work_estimation_tasks">
-                                    <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="date_start"/>
-                                    <field name="date" string="End Date"/>
-                                    <field name="priority" groups="base.group_no_one"/>
-                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" groups="base.group_multi_currency" required="1"/>
-                                    <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
-                                </group>
+                            <group string="Administration">
+                                <field name="privacy_visibility" widget="radio"/>
+                                <field name="planned_hours" widget="float_time"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                                <field name="effective_hours" widget="float_time"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                                <field name="resource_calendar_id"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                            </group>
+                            <group string="Miscellaneous" name="misc">
+                                <field name="date_start"/>
+                                <field name="date" string="End Date"/>
+                                <field name="priority" groups="base.group_no_one"/>
+                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                <field name="currency_id" groups="base.group_multi_currency" required="1"/>
+                                <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
                             </group>
                         </page>
                         <page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages">
-- 
cgit v1.2.3


From 8fbfc997aebb788d79200e711389817e9ce719df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 15:25:19 +0200
Subject: [REF] project: stage/status refactoring Removed concept of state on
 project.task (and propagated report) Removed python inheritance towards
 base_stage (specific code will be re-added)

bzr revid: tde@openerp.com-20130626132519-988nfq8pw8h8c8e8
---
 addons/project/project_view.xml | 60 ++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 33842a9a19c..8eafacd3bc0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,23 +18,20 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
+                    <field name="partner_id"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <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"/>
+                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]"/>
                     <separator/>
-                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <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="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <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+"/>
-                    <field name="partner_id"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
+                        help="Show only tasks having a deadline"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -371,18 +368,6 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <!--
-                        <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"/>
-                        -->
-                        <button name="project_task_reevaluate" string="Reactivate" type="object"
-                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <button name="do_cancel" string="Cancel Task" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">
@@ -396,8 +381,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" 
-                                attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" 
+                            <field name="user_id"
                                 options='{"no_open": True}'
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                             <field name="planned_hours" widget="float_time"
@@ -405,15 +389,15 @@
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline"/>
                             <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
+                            <field name="description" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
@@ -427,7 +411,7 @@
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -436,7 +420,7 @@
                         </page>
                         <page string="Delegation" groups="project.group_delegate_task">
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
+                                    groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -445,7 +429,6 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -453,12 +436,11 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                        <page string="Extra Info">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="state" invisible="1"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
@@ -467,6 +449,7 @@
                                     <field name="date_end"/>
                                 </group>
                                 <group>
+                                    <field name="date_last_stage_update" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -493,7 +476,6 @@
                     <field name="user_email"/>
                     <field name="description"/>
                     <field name="sequence"/>
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
@@ -513,7 +495,7 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
+                                        <!-- <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> -->
                                       </ul>
                                     </li>
                                     <br/>
@@ -562,7 +544,7 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:message_unread==True" colors="red:date_deadline and (date_deadline&lt;current_date)" string="Tasks">
                     <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
@@ -575,7 +557,6 @@
                     <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)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" groups="base.group_no_one"/>
                     <field name="date_end" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -706,7 +687,6 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -723,7 +703,7 @@
                 <tree string="Task Stage">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="state"/>
+                    <field name="fold"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From 9e17dd58d819d00fa6c00d7f28355d6c1ba94d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:22:42 +0200
Subject: [FIX] project: fixed various report views + some filters.

bzr revid: tde@openerp.com-20130626142242-aztr40zazsl20eif
---
 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 8eafacd3bc0..cc040983030 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -36,8 +36,9 @@
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Last Action" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
                 </search>
-- 
cgit v1.2.3


From 48648073959b30c76ec0385a7fe36ae68991a120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 09:54:24 +0200
Subject: [FIX] project_*: various fixes in views.

bzr revid: tde@openerp.com-20130627075424-j9ggzi62b24yk3g7
---
 addons/project/project_view.xml | 8 +++++---
 1 file changed, 5 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 cc040983030..e8ed9ed6ede 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -496,7 +496,6 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <!-- <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> -->
                                       </ul>
                                     </li>
                                     <br/>
@@ -643,7 +642,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,kanban</field>
-            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
@@ -748,7 +747,10 @@
         </record>
 
         <!-- User Form -->
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+                    domain="[('stage_id.fold', '!=', True)]"
+                    id="act_res_users_2_project_task_opened" name="Assigned Tasks"
+                    res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <!-- Tags -->
         <record model="ir.ui.view" id="project_category_search_view">
-- 
cgit v1.2.3


From 4b0baa3615aee3e528ccef0b60142ba7acb7976f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Jul 2013 14:25:26 +0200
Subject: [CLEAN] project, project_issue, project_mrp: misc cleaning of code +
 fixed bug in project_mrp + re-added commentred tests in project_mrp

bzr revid: tde@openerp.com-20130710122526-tf87avul7huqgigg
---
 addons/project/project_view.xml | 10 ++++------
 1 file changed, 4 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 e8ed9ed6ede..30943cff331 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,25 +18,23 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
-                    <field name="partner_id"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                     <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]"/>
-                    <separator/>
                     <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                         help="Show only tasks having a deadline"/>
+                    <field name="partner_id"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Last Action" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
+                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
-- 
cgit v1.2.3


From ea0fe404a97e1720780425b26c2c5ce89dd11ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 11 Jul 2013 14:02:36 +0200
Subject: [IMP] project, project_issue: added search ons tage for task and
 issue.

bzr revid: tde@openerp.com-20130711120236-ryzz7wkzxyb8shds
---
 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 30943cff331..b9faa5f9984 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,6 +30,7 @@
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="stage_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-- 
cgit v1.2.3


From 8c9c9de9795abfe49c5dcaf106c0fc8edfd6d17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 11 Jul 2013 14:06:51 +0200
Subject: [FIX] Fixed commit about adding stage_id in search view: overridden
 domain because of a crashotherwise.

bzr revid: tde@openerp.com-20130711120651-2c52hgui1jh1ogsl
---
 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 b9faa5f9984..8046774e5c0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,7 +30,7 @@
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="stage_id"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-- 
cgit v1.2.3


From 85b1d336e38d926789e4569ceafb991bb494bb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 19 Jul 2013 11:00:58 +0200
Subject: [CLEAN] project: misc cleaning before merging

bzr revid: tde@openerp.com-20130719090058-wngpyzf7oz3rnftp
---
 addons/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8046774e5c0..fd44353b177 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -747,7 +747,6 @@
 
         <!-- User Form -->
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
-                    domain="[('stage_id.fold', '!=', True)]"
                     id="act_res_users_2_project_task_opened" name="Assigned Tasks"
                     res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
-- 
cgit v1.2.3