From 4ac5ff962b0cfb1d5d1dde9d80252eb0963d1ed1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:23:09 +0530
Subject: [PATCH] [IMP] improved view for mail.catchall.domain

bzr revid: tpa@tinyerp.com-20120705065309-sn7xw83x133r4wuw
---
 addons/crm/crm.py                             | 2 +-
 addons/crm/crm_view.xml                       | 2 +-
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/mail/mail_group.py                     | 2 +-
 addons/mail/mail_group_view.xml               | 2 +-
 addons/mail/res_users.py                      | 2 +-
 addons/mail/res_users_view.xml                | 2 +-
 addons/project/project.py                     | 7 ++-----
 addons/project/project_view.xml               | 2 +-
 10 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index e1fa87d2e5b..9549e7589d2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -167,7 +167,7 @@ class crm_case_section(osv.osv):
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
             if not domain:
                 doc = etree.XML(res['arch'])
-                alias_node = doc.xpath("//field[@name='alias_id']")[0]
+                alias_node = doc.xpath("//div[@name='alias_box']")[0]
                 parent = alias_node.getparent()
                 parent.remove(alias_node)
                 res['arch'] = etree.tostring(doc)
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ea29b619d13..8f5c1d54cbc 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -88,7 +88,7 @@
                                 <field name="member_ids"/>
                             </group>
                             <group>
-                                <div>
+                                <div name="alias_box">
                                     <label for="alias_name"/>
                                     <field name="alias_name" class="oe_inline" required="0"/>@<field name="alias_domain" class="oe_inline"/>
                                 </div>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4251b29f2fd..39a158da483 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -563,7 +563,7 @@ class hr_job(osv.osv):
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
             if not domain:
                 doc = etree.XML(res['arch'])
-                alias_node = doc.xpath("//field[@name='alias_id']")[0]
+                alias_node = doc.xpath("//div[@name='alias_box']")[0]
                 parent = alias_node.getparent()
                 parent.remove(alias_node)
                 res['arch'] = etree.tostring(doc)
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3375dd953f7..c0abafff1fe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -350,7 +350,7 @@
             </field>
             <field name="company_id" version="7.0" position="after">
                 <group colspan="4">
-                    <div>
+                    <div name="alias_box">
                         <label for="alias_name"/>
                         <field name="alias_name" required="0" class="oe_inline"/>@
                         <field name="alias_domain" class="oe_inline"/>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 9cbaaa7892b..ed200c69f8a 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -147,7 +147,7 @@ class mail_group(osv.osv):
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
             if not domain:
                 doc = etree.XML(res['arch'])
-                alias_node = doc.xpath("//field[@name='alias_id']")[0]
+                alias_node = doc.xpath("//div[@name='alias_box']")[0]
                 parent = alias_node.getparent()
                 parent.remove(alias_node)
                 res['arch'] = etree.tostring(doc)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 0fde2d96131..c512af7fa7e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -69,7 +69,7 @@
                                 <field name="public" class="oe_inline"/>
                             </div>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <div>
+                            <div name="alias_box">
                                 <label for="alias_name"/>
                                 <field name="alias_name" required="0" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/>
                             </div>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index e30f84fc70e..5b042847a50 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -66,7 +66,7 @@ class res_users(osv.osv):
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
             if not domain:
                 doc = etree.XML(res['arch'])
-                alias_node = doc.xpath("//field[@name='alias_id']")[0]
+                alias_node = doc.xpath("//div[@name='alias_box']")[0]
                 parent = alias_node.getparent()
                 parent.remove(alias_node)
                 res['arch'] = etree.tostring(doc)
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 3a099450120..ad52a8bdaaa 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -33,7 +33,7 @@
                 </xpath>
                 <field name="active" position="after">
                     <group colspan="2">
-                        <div>
+                        <div name="alias_box">
                             <label for="alias_name"/>
                             <field name="alias_name" readonly="1" required="0" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/>
                         </div>
diff --git a/addons/project/project.py b/addons/project/project.py
index 637faca6556..2d3ea2c5082 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -263,15 +263,12 @@ class project(osv.osv):
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
             if not domain:
                 doc = etree.XML(res['arch'])
-                alias_node = doc.xpath("//field[@name='alias_id']")[0]
-                parent = alias_node.getparent()
-                parent.remove(alias_node)
                 if view_type == "form":
-                    model_node = doc.xpath("//field[@name='alias_model']")[0]
+                    model_node = doc.xpath("//group[@string='Mailbox Alias']")[0]
                     parent = model_node.getparent()
                     parent.remove(model_node)
                 else:
-                    model_node = doc.xpath("//field[@name='alias_id']")[0]
+                    model_node = doc.xpath("//div[@name='alias_box']")[0]
                     parent = model_node.getparent()
                     parent.remove(model_node)
                 res['arch'] = etree.tostring(doc)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 47ffb87063a..585947bddb7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -229,7 +229,7 @@
                                         <div>Progress</div>
                                         <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
                                     </div>
-                                    <div  t-if="record.alias_id.raw_value" class="oe_kanban_ellipsis">
+                                    <div name="alias_box" t-if="record.alias_id.raw_value" class="oe_kanban_ellipsis">
                                         Mailbox Alias :
                                         <a t-attf-href="mailto:#{record.alias_id.raw_value}"><field name="alias_id"/></a>
                                     </div>