odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improved view for mail.catchall.domain 

bzr revid: tpa@tinyerp.com-20120705065309-sn7xw83x133r4wuw
This commit is contained in:
Turkesh Patel (Open ERP) 2012-07-05 12:23:09 +05:30
parent 2b75b270f9
commit 4ac5ff962b
10 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm.py
View File

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

2
addons/crm/crm_view.xml
View File

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

2
addons/hr_recruitment/hr_recruitment.py
View File

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

2
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -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"/>

2
addons/mail/mail_group.py
View File

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

2
addons/mail/mail_group_view.xml
View File

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

2
addons/mail/res_users.py
View File

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

2
addons/mail/res_users_view.xml
View File

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

7
addons/project/project.py
View File

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

2
addons/project/project_view.xml
View File

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