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

[MERGE] [IMP] mail, report_webkit: view improvements + better name_get for mail and aliases. 

bzr revid: tde@openerp.com-20140509102355-wor8j7cy3egna3qx
This commit is contained in:
Jitendra Prajapati 2014-05-09 12:23:55 +02:00 committed by Thibault Delavallée
parent 9b15769a71 6eeb3eab49
commit 1f86156991
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/mail/mail_alias.py
View File

@ -27,6 +27,7 @@ from openerp.osv import fields, osv
from openerp.tools import ustr
from openerp.modules.registry import RegistryManager
from openerp import SUPERUSER_ID
from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
@ -129,16 +130,18 @@ class mail_alias(osv.Model):
]
def name_get(self, cr, uid, ids, context=None):
"""Return the mail alias display alias_name, inclusing the implicit
mail catchall domain from config.
e.g. `jobs@openerp.my.openerp.com` or `sales@openerp.my.openerp.com`
"""Return the mail alias display alias_name, including the implicit
mail catchall domain if exists from config otherwise "New Alias".
e.g. `jobs@openerp.my.openerp.com` or `jobs` or 'New Alias'
"""
res = []
for record in self.browse(cr, uid, ids, context=context):
if record.alias_name and record.alias_domain:
res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
elif record.alias_name:
res.append((record['id'], "%s" % (record.alias_name)))
else:
res.append((record['id'], False))
res.append((record['id'], _("Inactive Alias")))
return res
def _find_unique(self, cr, uid, name, context=None):

1
addons/mail/mail_mail.py
View File

@ -41,6 +41,7 @@ class mail_mail(osv.Model):
_description = 'Outgoing Mails'
_inherits = {'mail.message': 'mail_message_id'}
_order = 'id desc'
_rec_name = 'subject'
_columns = {
'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),

4
addons/mail/mail_mail_view.xml
View File

@ -10,13 +10,14 @@
<button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
<button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
<button name="cancel" string="Cancel" type="object" states='outgoing'/>
<field name="state" widget="statusbar" statusbar_visible="outgoing,sent,received,exception,cancel"/>
</header>
<sheet>
<field name="mail_message_id" required="0" invisible="1"/>
<label for="subject" class="oe_edit_only"/>
<h2><field name="subject"/></h2>
<div style="vertical-align: top;">
by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" readonly="1" class="oe_inline"/>
<button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
context="{'default_composition_mode':'reply', 'default_parent_id': mail_message_id}" states='received,sent,exception,cancel'/>
</div>
@ -38,7 +39,6 @@
<field name="auto_delete"/>
<field name="notification"/>
<field name="type"/>
<field name="state"/>
<field name="mail_server_id"/>
<field name="model"/>
<field name="res_id"/>

4
addons/report_webkit/header_view.xml
View File

@ -5,12 +5,12 @@
<field name="model">ir.header_img</field>
<field name="arch" type="xml">
<form string="Header Image" version="7.0">
<field name="img" widget="image" class="oe_left"/>
<group>
<field name="name"/>
<field name="type"/>
<field name='company_id' />
<field name="company_id"/>
</group>
<field name="img" widget="image" class="oe_right"/>
</form>
</field>
</record>