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/mail/mail_group_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/mail/mail_group_view.xml')

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 04212b2f58a..96f5aa7b66a 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -44,7 +44,7 @@
                                 <div class="oe_group_details">
                                     <h4><a type="open"><field name="name"/></a></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_grey">
                                         <field name="description"/>
@@ -80,13 +80,13 @@
                             <h1><field name="name" readonly="0"/></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="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">
-                                    <field name="alias_name" class="oe_inline"
-                                            attrs="{'required': [('alias_id', '!=', False)]}"/>
-                                    @
-                                    <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    <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>
-- 
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/mail/mail_group_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/mail/mail_group_view.xml')

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 96f5aa7b66a..d1f22ac17db 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -88,6 +88,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>
                         <field name="description" placeholder="Topics discussed in this group..."/>
-- 
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/mail/mail_group_view.xml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'addons/mail/mail_group_view.xml')

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d1f22ac17db..9e3295a9b55 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -78,19 +78,18 @@
                                 <label for="name" string="Group Name"/>
                             </div>
                             <h1><field name="name" readonly="0"/></h1>
-                            <div name="group_alias"
+                            <group colspan="2" 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>
+                                <label for="alias_id" string="%%" class="oe_e oe_e_alias" style="min-width: 20px;"/>
+                                <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>
+                                </div>
+                                <label for="alias_contact" string="V" class="oe_e oe_e_alias" style="min-width: 20px;"/>
+                                <field name="alias_contact" class="oe_inline" nolabel="1"/>
+                            </group>
                         </div>
                         <field name="description" placeholder="Topics discussed in this group..."/>
                         <div class="oe_clear"/>
-- 
cgit v1.2.3


From 88e3505554038350ae0274e9359bbffff342b9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 16 May 2013 18:42:07 +0200
Subject: [IMP] mail_alias: added reference to the parent record. The parent
 record is the record that holds the alias. It is different from the record
 updated or created using the alias. For example projects have aliases whose
 parent is the given projet, and that creates new task inside the project.
 Updated alias creation and management accordingly. This ownership concept is
 used to compute the 'followers' contact settings of aliases.

bzr revid: tde@openerp.com-20130516164207-1zr0q6abw6a34ndf
---
 addons/mail/mail_group_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/mail/mail_group_view.xml')

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 9e3295a9b55..c94fb9be727 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -82,7 +82,8 @@
                                     attrs="{'invisible': [('alias_domain', '=', False)]}">
                                 <label for="alias_id" string="%%" class="oe_e oe_e_alias" style="min-width: 20px;"/>
                                 <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>
-- 
cgit v1.2.3


From d0aea936ac5b7398104f67ffcc3dc9a153c6c4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 25 Jun 2013 10:46:30 +0200
Subject: [CLEAN] Misc cleaning before merging, mainly in views

bzr revid: tde@openerp.com-20130625084630-oqlertvzxl8a8w7f
---
 addons/mail/mail_group_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/mail_group_view.xml')

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index c94fb9be727..8bf61dbdb1e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -82,8 +82,8 @@
                                     attrs="{'invisible': [('alias_domain', '=', False)]}">
                                 <label for="alias_id" string="%%" class="oe_e oe_e_alias" style="min-width: 20px;"/>
                                 <div name="alias_def">
-                                    <field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"
-                                            required="0"/>
+                                    <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>
-- 
cgit v1.2.3