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/res_users_view.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index f49ff72194a..b6a5ac3b9cf 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,8 +27,14 @@
                     <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
-                    <field name="alias_domain" invisible="1"/>
-                    <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <label for="alias_id" string="Alias"/>
+                    <div name="group_alias"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                        <div name="edit_alias" class="oe_edit_only">
+                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </div>
+                    </div>
                 </field>
             </data>
             </field>
-- 
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/res_users_view.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index b6a5ac3b9cf..8cbe91c07c6 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -35,6 +35,7 @@
                             <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                         </div>
                     </div>
+                    <field name="alias_contact"/>
                 </field>
             </data>
             </field>
-- 
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/mail/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 8cbe91c07c6..b807a93d023 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -35,7 +35,7 @@
                             <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                         </div>
                     </div>
-                    <field name="alias_contact"/>
+                    <field name="alias_contact" string="Accept Emails From"/>
                 </field>
             </data>
             </field>
-- 
cgit v1.2.3


From 82690ba2b29858757ded65340cf93377abf2046b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 10 May 2013 16:48:29 +0200
Subject: [IMP] mail, hr: add new groups to res users form view (technical
 group because no specific use, but being able to modify them directly using
 the interface is quite useful).

bzr revid: tde@openerp.com-20130510144829-btj6q6x16bpphrcm
---
 addons/mail/res_users_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index f49ff72194a..5b08ba9edd8 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -30,6 +30,12 @@
                     <field name="alias_domain" invisible="1"/>
                     <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                 </field>
+                <group string="Email preferences" position="after">
+                    <group name="misc" string="Miscellaneous"
+                            groups="base.group_no_one">
+                        <field name="display_groups_suggestions"/>
+                    </group>
+                </group>
             </data>
             </field>
         </record>
-- 
cgit v1.2.3


From f9bc6be1aca67fc59f1c286a82986f921240efc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Jun 2013 13:03:44 +0200
Subject: [CLEAN] Before merging: removed an added file not used; cleaned some
 debugging data; improved user form view to better separate email/login and
 messaging alias.

bzr revid: tde@openerp.com-20130621110344-zx2kxan47uctctka
---
 addons/mail/res_users_view.xml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 49edd56ee10..da16aa080c0 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,22 +27,31 @@
                     <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
-                    <label for="alias_id" string="Alias"/>
+                    <!-- <label for="alias_id" string="Alias" -->
+                            <!-- attrs="{'invisible': [('alias_domain', '=', False)]}"/> -->
                     <div name="group_alias"
-                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                            attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> -->
                         <div name="edit_alias" class="oe_edit_only">
-                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            <!-- <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> -->
                         </div>
+                        <!-- <field name="alias_contact" string="Accept Emails From"/> -->
                     </div>
-                    <field name="alias_contact" string="Accept Emails From"/>
                 </field>
-                <group string="Email preferences" position="after">
-                    <group name="misc" string="Miscellaneous"
-                            groups="base.group_no_one">
-                        <field name="display_groups_suggestions"/>
-                    </group>
-                </group>
+                <field name="signature" position="before">
+                    <label for="alias_id" string="Messaging Alias" class="oe_read_only"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                    </div>
+                    <field name="alias_contact" string="Alias Accepts Emails From"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <field name="display_groups_suggestions" groups="base.group_no_one"/>
+                </field>
             </data>
             </field>
         </record>
-- 
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/res_users_view.xml | 48 ++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

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

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index da16aa080c0..2bf54b4bafd 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -22,37 +22,25 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
-            <data>
-                <field name="signature" position="before">
-                    <field name="notification_email_send"/>
-                </field>
-                <field name="email" position="after">
-                    <!-- <label for="alias_id" string="Alias" -->
-                            <!-- attrs="{'invisible': [('alias_domain', '=', False)]}"/> -->
-                    <div name="group_alias"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> -->
-                        <div name="edit_alias" class="oe_edit_only">
-                            <!-- <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> -->
+                <data>
+                    <field name="signature" position="before">
+                        <field name="notification_email_send"/>
+                    </field>
+                    <field name="signature" position="before">
+                        <label for="alias_id" string="Messaging Alias" class="oe_read_only"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                         </div>
-                        <!-- <field name="alias_contact" string="Accept Emails From"/> -->
-                    </div>
-                </field>
-                <field name="signature" position="before">
-                    <label for="alias_id" string="Messaging Alias" class="oe_read_only"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                    </div>
-                    <field name="alias_contact" string="Alias Accepts Emails From"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    <field name="display_groups_suggestions" groups="base.group_no_one"/>
-                </field>
-            </data>
+                        <field name="alias_contact" string="Alias Accepts Emails From"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <field name="display_groups_suggestions" groups="base.group_no_one"/>
+                    </field>
+                </data>
             </field>
         </record>
 
-- 
cgit v1.2.3