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 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 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