mreficent
8 years ago
committed by
Pedro M. Baeza
Pedro M. Baeza
18 changed files with 145 additions and 186 deletions
-
49fetchmail_notify_error_to_sender/README.rst
-
24fetchmail_notify_error_to_sender/__init__.py
-
33fetchmail_notify_error_to_sender/__openerp__.py
-
3fetchmail_notify_error_to_sender/data/email_template_data.xml
-
30fetchmail_notify_error_to_sender/fetchmail.py
-
4fetchmail_notify_error_to_sender/i18n/de.po
-
4fetchmail_notify_error_to_sender/i18n/es.po
-
4fetchmail_notify_error_to_sender/i18n/fr.po
-
4fetchmail_notify_error_to_sender/i18n/it.po
-
4fetchmail_notify_error_to_sender/i18n/pt_BR.po
-
4fetchmail_notify_error_to_sender/i18n/pt_PT.po
-
4fetchmail_notify_error_to_sender/i18n/sl.po
-
4fetchmail_notify_error_to_sender/i18n/tr.po
-
75fetchmail_notify_error_to_sender/mail_thread.py
-
6fetchmail_notify_error_to_sender/models/__init__.py
-
15fetchmail_notify_error_to_sender/models/fetchmail.py
-
53fetchmail_notify_error_to_sender/models/mail_thread.py
-
11fetchmail_notify_error_to_sender/views/fetchmail_view.xml
@ -1,22 +1,6 @@ |
|||||
# -*- coding: utf-8 -*- |
# -*- coding: utf-8 -*- |
||||
############################################################################## |
|
||||
# |
|
||||
# Copyright (C) 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as published |
|
||||
# by the Free Software Foundation, either version 3 of the License, or |
|
||||
# (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
# Copyright 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
||||
|
# Copyright 2017 Eficent <http://www.eficent.com> |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
from . import mail_thread |
|
||||
from . import fetchmail |
|
||||
|
from . import models |
||||
@ -1,40 +1,25 @@ |
|||||
# -*- coding: utf-8 -*- |
# -*- coding: utf-8 -*- |
||||
############################################################################## |
|
||||
# |
|
||||
# Copyright (C) 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as published |
|
||||
# by the Free Software Foundation, either version 3 of the License, or |
|
||||
# (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
# Copyright 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
||||
|
# Copyright 2017 Eficent <http://www.eficent.com> |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
{ |
{ |
||||
'name': 'Send notice on fetchmail errors', |
'name': 'Send notice on fetchmail errors', |
||||
'summary': 'If fetching mails gives error, send an email to sender', |
'summary': 'If fetching mails gives error, send an email to sender', |
||||
'version': '8.0.1.0.1', |
|
||||
|
'version': '9.0.1.0.0', |
||||
'category': 'Tools', |
'category': 'Tools', |
||||
'author': "Agile Business Group,Odoo Community Association (OCA)", |
|
||||
'website': 'http://www.agilebg.com', |
|
||||
|
'author': "Agile Business Group,Eficent,Odoo Community Association (OCA)", |
||||
|
'website': 'https://github.com/OCA/server-tools', |
||||
'license': 'AGPL-3', |
'license': 'AGPL-3', |
||||
'depends': [ |
'depends': [ |
||||
'fetchmail', |
'fetchmail', |
||||
], |
], |
||||
'data': [ |
'data': [ |
||||
'fetchmail_view.xml', |
|
||||
'email_template_data.xml', |
|
||||
|
'views/fetchmail_view.xml', |
||||
|
'data/email_template_data.xml', |
||||
], |
], |
||||
'qweb': [ |
'qweb': [ |
||||
], |
], |
||||
'installable': True, |
'installable': True, |
||||
'auto_install': False, |
|
||||
|
'application': False, |
||||
} |
} |
||||
@ -1,9 +1,8 @@ |
|||||
<?xml version="1.0" ?> |
<?xml version="1.0" ?> |
||||
<openerp> |
<openerp> |
||||
|
|
||||
<data noupdate="1"> |
<data noupdate="1"> |
||||
<!--Email template --> |
<!--Email template --> |
||||
<record id="email_template_error_notice" model="email.template"> |
|
||||
|
<record id="email_template_error_notice" model="mail.template"> |
||||
<field name="name">Fetchmail - error notice</field> |
<field name="name">Fetchmail - error notice</field> |
||||
<field name="email_from">${ctx.get('sender_message').get('to')|safe}</field> |
<field name="email_from">${ctx.get('sender_message').get('to')|safe}</field> |
||||
<field name="email_to">${ctx.get('sender_message').get('from')|safe}</field> |
<field name="email_to">${ctx.get('sender_message').get('from')|safe}</field> |
||||
@ -1,30 +0,0 @@ |
|||||
# -*- coding: utf-8 -*- |
|
||||
############################################################################## |
|
||||
# |
|
||||
# Copyright (C) 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as published |
|
||||
# by the Free Software Foundation, either version 3 of the License, or |
|
||||
# (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
|
||||
from openerp import models, fields |
|
||||
|
|
||||
|
|
||||
class fetchmail_server(models.Model): |
|
||||
|
|
||||
_inherit = 'fetchmail.server' |
|
||||
error_notice_template_id = fields.Many2one( |
|
||||
'email.template', string="Error notice template", |
|
||||
help="Set here the template to use to send notice to sender when " |
|
||||
"errors occur while fetching email") |
|
||||
@ -1,75 +0,0 @@ |
|||||
# -*- coding: utf-8 -*- |
|
||||
############################################################################## |
|
||||
# |
|
||||
# Copyright (C) 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as published |
|
||||
# by the Free Software Foundation, either version 3 of the License, or |
|
||||
# (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
|
||||
from openerp.osv import osv |
|
||||
|
|
||||
|
|
||||
class mail_thread(osv.AbstractModel): |
|
||||
_inherit = 'mail.thread' |
|
||||
|
|
||||
def message_route_verify( |
|
||||
self, cr, uid, message, message_dict, route, update_author=True, |
|
||||
assert_model=True, create_fallback=True, allow_private=False, |
|
||||
context=None |
|
||||
): |
|
||||
res = () |
|
||||
if context is None: |
|
||||
context = {} |
|
||||
try: |
|
||||
res = super(mail_thread, self).message_route_verify( |
|
||||
cr, uid, message, message_dict, route, |
|
||||
update_author=update_author, assert_model=assert_model, |
|
||||
create_fallback=create_fallback, allow_private=allow_private, |
|
||||
context=context) |
|
||||
except ValueError as ve: |
|
||||
fetchmail_server_id = context.get('fetchmail_server_id') |
|
||||
if not fetchmail_server_id: |
|
||||
raise ve |
|
||||
fetchmail_server = self.pool['fetchmail.server'].browse( |
|
||||
cr, uid, fetchmail_server_id, context) |
|
||||
if not fetchmail_server.error_notice_template_id: |
|
||||
raise ve |
|
||||
context['sender_message'] = message |
|
||||
context['route_exception'] = ve |
|
||||
self.pool['email.template'].send_mail( |
|
||||
cr, uid, fetchmail_server.error_notice_template_id.id, |
|
||||
fetchmail_server.id, context=context) |
|
||||
context['error_notice_sent'] = True |
|
||||
return res |
|
||||
|
|
||||
def message_route( |
|
||||
self, cr, uid, message, message_dict, model=None, thread_id=None, |
|
||||
custom_values=None, context=None |
|
||||
): |
|
||||
if context is None: |
|
||||
context = {} |
|
||||
res = [] |
|
||||
try: |
|
||||
res = super(mail_thread, self).message_route( |
|
||||
cr, uid, message, message_dict, model=model, |
|
||||
thread_id=thread_id, custom_values=custom_values, |
|
||||
context=context) |
|
||||
except ValueError as ve: |
|
||||
if context.get('error_notice_sent'): |
|
||||
# avoid raising exception and setting mail message UNSEEN |
|
||||
return [] |
|
||||
else: |
|
||||
raise ve |
|
||||
return res |
|
||||
@ -0,0 +1,6 @@ |
|||||
|
# -*- coding: utf-8 -*- |
||||
|
# Copyright 2017 Eficent <http://www.eficent.com> |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
|
from . import fetchmail |
||||
|
from . import mail_thread |
||||
@ -0,0 +1,15 @@ |
|||||
|
# -*- coding: utf-8 -*- |
||||
|
# Copyright 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
||||
|
# Copyright 2017 Eficent <http://www.eficent.com> |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
|
from openerp import fields, models |
||||
|
|
||||
|
|
||||
|
class FetchmailServer(models.Model): |
||||
|
|
||||
|
_inherit = 'fetchmail.server' |
||||
|
error_notice_template_id = fields.Many2one( |
||||
|
'mail.template', string="Error notice template", |
||||
|
help="Set here the template to use to send notice to sender when " |
||||
|
"errors occur while fetching email") |
||||
@ -0,0 +1,53 @@ |
|||||
|
# -*- coding: utf-8 -*- |
||||
|
# Copyright 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> |
||||
|
# Copyright 2017 Eficent <http://www.eficent.com> |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
|
from openerp import api, models |
||||
|
|
||||
|
|
||||
|
class MailThread(models.AbstractModel): |
||||
|
_inherit = 'mail.thread' |
||||
|
|
||||
|
@api.model |
||||
|
def message_route_verify( |
||||
|
self, message, message_dict, route, update_author=True, |
||||
|
assert_model=True, create_fallback=True, allow_private=False): |
||||
|
res = () |
||||
|
try: |
||||
|
res = super(MailThread, self).message_route_verify( |
||||
|
message, message_dict, route, |
||||
|
update_author=update_author, assert_model=assert_model, |
||||
|
create_fallback=create_fallback, allow_private=allow_private) |
||||
|
except ValueError as ve: |
||||
|
fetchmail_server_id = self.env.context.get('fetchmail_server_id') |
||||
|
if not fetchmail_server_id: |
||||
|
raise ve |
||||
|
fetchmail_server = self.pool['fetchmail.server'].browse( |
||||
|
fetchmail_server_id) |
||||
|
if not fetchmail_server.error_notice_template_id: |
||||
|
raise ve |
||||
|
self.env.context['sender_message'] = message |
||||
|
self.env.context['route_exception'] = ve |
||||
|
self.env['mail.template'].send_mail( |
||||
|
fetchmail_server.error_notice_template_id.id, |
||||
|
fetchmail_server.id) |
||||
|
self.env.context['error_notice_sent'] = True |
||||
|
return res |
||||
|
|
||||
|
@api.model |
||||
|
def message_route( |
||||
|
self, message, message_dict, model=None, thread_id=None, |
||||
|
custom_values=None): |
||||
|
res = [] |
||||
|
try: |
||||
|
res = super(MailThread, self).message_route( |
||||
|
message, message_dict, model=model, |
||||
|
thread_id=thread_id, custom_values=custom_values) |
||||
|
except ValueError as ve: |
||||
|
if self.env.context.get('error_notice_sent'): |
||||
|
# avoid raising exception and setting mail message UNSEEN |
||||
|
return [] |
||||
|
else: |
||||
|
raise ve |
||||
|
return res |
||||
@ -1,16 +1,13 @@ |
|||||
<?xml version="1.0"?> |
<?xml version="1.0"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
|
|
||||
|
<odoo> |
||||
<record model="ir.ui.view" id="view_email_server_form"> |
<record model="ir.ui.view" id="view_email_server_form"> |
||||
<field name="name">fetchmail.server.form</field> |
<field name="name">fetchmail.server.form</field> |
||||
<field name="model">fetchmail.server</field> |
<field name="model">fetchmail.server</field> |
||||
<field name="inherit_id" ref="fetchmail.view_email_server_form"></field> |
<field name="inherit_id" ref="fetchmail.view_email_server_form"></field> |
||||
<field name="arch" type="xml"> |
<field name="arch" type="xml"> |
||||
<xpath expr="//page[@string='Advanced']/group/field[@name='active']" position="after"> |
|
||||
|
<field name="active" position="after"> |
||||
<field name="error_notice_template_id"/> |
<field name="error_notice_template_id"/> |
||||
</xpath> |
|
||||
|
</field> |
||||
</field> |
</field> |
||||
</record> |
</record> |
||||
</data> |
|
||||
</openerp> |
|
||||
|
</odoo> |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue