Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-view-tpa into
lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mail-alias-jam-view-tpa/+merge/113502
[IMP] improved view for alias_id.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mail-alias-jam-view-tpa/+merge/113502
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam.
=== modified file 'crm/crm.py'
--- crm/crm.py 2012-07-05 06:59:39 +0000
+++ crm/crm.py 2012-07-05 07:23:24 +0000
@@ -167,7 +167,7 @@
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)
=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml 2012-07-05 05:38:40 +0000
+++ crm/crm_view.xml 2012-07-05 07:23:24 +0000
@@ -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>
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py 2012-07-05 06:59:39 +0000
+++ hr_recruitment/hr_recruitment.py 2012-07-05 07:23:24 +0000
@@ -563,7 +563,7 @@
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)
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-07-05 05:52:13 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-07-05 07:23:24 +0000
@@ -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"/>
=== modified file 'mail/mail_group.py'
--- mail/mail_group.py 2012-07-05 06:59:39 +0000
+++ mail/mail_group.py 2012-07-05 07:23:24 +0000
@@ -147,7 +147,7 @@
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)
=== modified file 'mail/mail_group_view.xml'
--- mail/mail_group_view.xml 2012-07-05 05:38:40 +0000
+++ mail/mail_group_view.xml 2012-07-05 07:23:24 +0000
@@ -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>
=== modified file 'mail/res_users.py'
--- mail/res_users.py 2012-07-05 06:59:39 +0000
+++ mail/res_users.py 2012-07-05 07:23:24 +0000
@@ -66,7 +66,7 @@
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)
=== modified file 'mail/res_users_view.xml'
--- mail/res_users_view.xml 2012-07-05 05:38:40 +0000
+++ mail/res_users_view.xml 2012-07-05 07:23:24 +0000
@@ -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>
=== modified file 'project/project.py'
--- project/project.py 2012-07-05 06:59:39 +0000
+++ project/project.py 2012-07-05 07:23:24 +0000
@@ -263,15 +263,12 @@
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)
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-07-05 06:08:06 +0000
+++ project/project_view.xml 2012-07-05 07:23:24 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
