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

[IMP] Keep Nuetral names of the alias 

bzr revid: jam@tinyerp.com-20120704095713-6ev7fvoz6ys3ihl9
This commit is contained in:
Jigar Amin - OpenERP 2012-07-04 15:27:13 +05:30
parent 4aeda05b97
commit a5e58974cc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/mail/mail_alias.py
View File

@ -19,9 +19,11 @@
#
##############################################################################
import re
from openerp.osv import fields, osv
from tools.translate import _
class mail_alias(osv.Model):
"""A Mail Alias is a mapping of an email address with a given OpenERP Document
model. It is used by OpenERP's mail gateway when processing incoming emails
@ -121,11 +123,13 @@ class mail_alias(osv.Model):
def create_unique_alias(self, cr, uid, vals, context=None):
model_pool = self.pool.get('ir.model')
values = {'alias_name': vals['alias_name']}
values = {}
if self.search(cr, uid, [('alias_name', '=', vals['alias_name'])]):
values.update({'alias_name': self._generate_alias(cr, uid, vals['alias_name'], sequence=1, context=context)})
model_sids = model_pool.search(cr, uid, [('model', '=', vals['alias_model_id'])])
values.update({'alias_model_id': model_sids[0]})
alias_name = re.sub(r'[^a-zA-Z0-9:]', '_', vals['alias_name']).lower()
values.update({'alias_name': values['alias_name']})
return self.create(cr, uid, values, context=context)

6
addons/mail/mail_alias_view.xml
View File

@ -15,11 +15,11 @@
<h2><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2>
<group colspan="4" col="4">
<field name="alias_model_id" readonly="1"/>
<field name="alias_user_id"/>
<field name="alias_force_thread_id"/>
<field name="alias_user_id" readonly="1"/>
<field name="alias_force_thread_id" readonly="1"/>
<newline/>
<separator string="Alias Mailbox Default Values" colspan="4"/>
<field name="alias_defaults" colspan="4" nolabel="1"/>
<field name="alias_defaults" colspan="4" nolabel="1" readonly="1"/>
</group>
</sheet>
</form>