diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-20 15:06:31 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-20 15:06:31 +0200 |
| commit | ccb78bfdd9ebc528e423e1b563b19dfee701308c (patch) | |
| tree | fb46e555544cdfe7f20ceef3f66ebf5a8f010206 /addons | |
| parent | de096a967d30eedd64c603940edced3729f886fd (diff) | |
[FIX] fetchmail: fetchmail_server_id added to mail.mail form view.
bzr revid: tde@openerp.com-20120820130631-3kn57wnvj4ssyrjt
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 6 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 544a4f81b96..24c977bba1d 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -77,7 +77,7 @@ class fetchmail_server(osv.osv): "emails to the existing conversations (documents)."), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, " "lower values mean higher priority"), - 'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True), + 'message_ids': fields.one2many('mail.mail', 'fetchmail_server_id', 'Messages', readonly=True), 'configuration' : fields.text('Configuration'), 'script' : fields.char('Script', readonly=True, size=64), } @@ -232,8 +232,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}) return True -class mail_message(osv.osv): - _inherit = "mail.message" +class mail_mail(osv.osv): + _inherit = "mail.mail" _columns = { 'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server", readonly=True, diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 7c049dedbb8..bdb1ebf2fa5 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -104,11 +104,11 @@ /> <record model="ir.ui.view" id="email_message_tree_view"> - <field name="name">mail.message.list.fetchmail</field> - <field name="model">mail.message</field> - <field name="inherit_id" ref="mail.view_email_message_tree"/> + <field name="name">mail.mail.list.fetchmail</field> + <field name="model">mail.mail</field> + <field name="inherit_id" ref="mail.view_email_message_form"/> <field name="arch" type="xml"> - <field name="user_id" position="after"> + <field name="references" position="after"> <field name="fetchmail_server_id"/> </field> </field> |