diff options
Diffstat (limited to 'addons/mail')
29 files changed, 127 insertions, 100 deletions
diff --git a/addons/mail/controllers/bus.py b/addons/mail/controllers/bus.py index 0249c823ec4..c735fe6bb8d 100644 --- a/addons/mail/controllers/bus.py +++ b/addons/mail/controllers/bus.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -* -import base64 -import openerp +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import SUPERUSER_ID -from openerp.http import request +from odoo import SUPERUSER_ID +from odoo.http import request, route +from odoo.addons.bus.controllers.main import BusController -class MailChatController(openerp.addons.bus.controllers.main.BusController): +class MailChatController(BusController): def _default_request_uid(self): """ For Anonymous people, they receive the access right of SUPERUSER_ID since they have NO access (auth=none) @@ -33,7 +33,7 @@ class MailChatController(openerp.addons.bus.controllers.main.BusController): # -------------------------- # Anonymous routes (Common Methods) # -------------------------- - @openerp.http.route('/mail/chat_post', type="json", auth="none") + @route('/mail/chat_post', type="json", auth="none") def mail_chat_post(self, uuid, message_content, **kwargs): request_uid = self._default_request_uid() # find the author from the user session, which can be None @@ -45,7 +45,7 @@ class MailChatController(openerp.addons.bus.controllers.main.BusController): message = mail_channel.sudo(request_uid).with_context(mail_create_nosubscribe=True).message_post(author_id=author_id, email_from=False, body=message_content, message_type='comment', subtype='mail.mt_comment', content_subtype='plaintext', **kwargs) return message and message.id or False - @openerp.http.route(['/mail/chat_history'], type="json", auth="none") + @route(['/mail/chat_history'], type="json", auth="none") def mail_chat_history(self, uuid, last_id=False, limit=20): request_uid = self._default_request_uid() channel = request.env["mail.channel"].sudo(request_uid).search([('uuid', '=', uuid)], limit=1) diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py index 399220d1875..c385153da7e 100644 --- a/addons/mail/controllers/main.py +++ b/addons/mail/controllers/main.py @@ -1,17 +1,18 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import base64 import json -from operator import itemgetter import psycopg2 import werkzeug -from werkzeug import url_encode -import openerp -from openerp import SUPERUSER_ID -from openerp import http -from openerp.exceptions import AccessError -from openerp.http import request +from operator import itemgetter +from werkzeug import url_encode -from openerp.addons.web.controllers.main import binary_content +from odoo import http, registry, SUPERUSER_ID +from odoo.addons.web.controllers.main import binary_content +from odoo.exceptions import AccessError +from odoo.http import request class MailController(http.Controller): @@ -29,9 +30,9 @@ class MailController(http.Controller): for db in dbs: message = dbs[db].decode('base64') try: - registry = openerp.registry(db) - with registry.cursor() as cr: - mail_thread = registry['mail.thread'] + db_registry = registry(db) + with db_registry.cursor() as cr: + mail_thread = db_registry['mail.thread'] mail_thread.message_process(cr, SUPERUSER_ID, None, message) except psycopg2.Error: pass @@ -222,7 +223,7 @@ class MailController(http.Controller): # if the current user has access to the document, get the partner avatar as sudo() request.env[res_model].browse(res_id).check_access_rule('read') if partner_id in request.env[res_model].browse(res_id).sudo().exists().message_ids.mapped('author_id').ids: - status, headers, _content = binary_content(model='res.partner', id=partner_id, field='image_medium', default_mimetype='image/png', env=request.env(user=openerp.SUPERUSER_ID)) + status, headers, _content = binary_content(model='res.partner', id=partner_id, field='image_medium', default_mimetype='image/png', env=request.env(user=SUPERUSER_ID)) # binary content return an empty string and not a placeholder if obj[field] is False if _content != '': content = _content diff --git a/addons/mail/models/ir_actions.py b/addons/mail/models/ir_actions.py index 66cf1c20461..af29863a902 100644 --- a/addons/mail/models/ir_actions.py +++ b/addons/mail/models/ir_actions.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import _, api, fields, models -from openerp.exceptions import UserError +from odoo import _, api, fields, models +from odoo.exceptions import UserError class ServerActions(models.Model): diff --git a/addons/mail/models/ir_autovacuum.py b/addons/mail/models/ir_autovacuum.py index 428256fc061..387afaa8843 100644 --- a/addons/mail/models/ir_autovacuum.py +++ b/addons/mail/models/ir_autovacuum.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import models +from odoo import models + class AutoVacuum(models.AbstractModel): _inherit = 'ir.autovacuum' diff --git a/addons/mail/models/mail_alias.py b/addons/mail/models/mail_alias.py index ee5cd6f12e9..d55a4c6b1c2 100644 --- a/addons/mail/models/mail_alias.py +++ b/addons/mail/models/mail_alias.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import logging import re import unicodedata -from openerp import _, api, fields, models, SUPERUSER_ID -from openerp.exceptions import ValidationError -from openerp.modules.registry import RegistryManager -from openerp.tools import ustr -from openerp.tools.safe_eval import safe_eval as eval +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError +from odoo.tools import ustr +from odoo.tools.safe_eval import safe_eval as eval _logger = logging.getLogger(__name__) diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index 9ce2e81feee..7cde2211fcc 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. from email.utils import formataddr import re import uuid -from openerp import _, api, fields, models, modules, tools -from openerp.exceptions import UserError -from openerp.osv import expression -from openerp.tools import ormcache -from openerp.tools.safe_eval import safe_eval as eval - +from odoo import _, api, fields, models, modules, tools +from odoo.exceptions import UserError +from odoo.osv import expression +from odoo.tools import ormcache +from odoo.tools.safe_eval import safe_eval as eval class ChannelPartner(models.Model): diff --git a/addons/mail/models/mail_followers.py b/addons/mail/models/mail_followers.py index 2dd62582b1d..293ae6c5938 100644 --- a/addons/mail/models/mail_followers.py +++ b/addons/mail/models/mail_followers.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import api, fields, models +from odoo import api, fields, models class Followers(models.Model): diff --git a/addons/mail/models/mail_mail.py b/addons/mail/models/mail_mail.py index 74fcb9720f2..13280a2a15f 100644 --- a/addons/mail/models/mail_mail.py +++ b/addons/mail/models/mail_mail.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 import datetime import logging +import psycopg2 import threading from email.utils import formataddr -import psycopg2 - -from openerp import _, api, fields, models -from openerp import tools -from openerp.addons.base.ir.ir_mail_server import MailDeliveryException -from openerp.tools.safe_eval import safe_eval as eval +from odoo import _, api, fields, models +from odoo import tools +from odoo.addons.base.ir.ir_mail_server import MailDeliveryException +from odoo.tools.safe_eval import safe_eval as eval _logger = logging.getLogger(__name__) diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 397755413b0..170bcbba864 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import logging from email.header import decode_header from email.utils import formataddr -import logging -from openerp import _, api, fields, models, SUPERUSER_ID -from openerp import tools -from openerp.exceptions import UserError, AccessError -from openerp.osv import expression +from odoo import _, api, fields, models, SUPERUSER_ID, tools +from odoo.exceptions import UserError, AccessError +from odoo.osv import expression _logger = logging.getLogger(__name__) diff --git a/addons/mail/models/mail_message_subtype.py b/addons/mail/models/mail_message_subtype.py index 0f2316a19b7..dfe99860f75 100644 --- a/addons/mail/models/mail_message_subtype.py +++ b/addons/mail/models/mail_message_subtype.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import fields, models +from odoo import fields, models class MailMessageSubtype(models.Model): diff --git a/addons/mail/models/mail_shortcode.py b/addons/mail/models/mail_shortcode.py index 8c659a1f134..36624bc0b2b 100644 --- a/addons/mail/models/mail_shortcode.py +++ b/addons/mail/models/mail_shortcode.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import cgi import re -from openerp import api, fields, models +from odoo import api, fields, models class MailShortcode(models.Model): diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py index a9f84a25cd7..7878b98038b 100644 --- a/addons/mail/models/mail_template.py +++ b/addons/mail/models/mail_template.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 import copy @@ -7,13 +8,12 @@ import dateutil.relativedelta as relativedelta import logging import lxml import urlparse -import openerp + from urllib import urlencode, quote as quote -from openerp import _, api, fields, models, SUPERUSER_ID -from openerp import tools -from openerp import report as odoo_report -from openerp.exceptions import UserError +from odoo import _, api, fields, models, osv, SUPERUSER_ID, tools +from odoo import report as odoo_report +from odoo.exceptions import UserError _logger = logging.getLogger(__name__) @@ -24,7 +24,7 @@ def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None): context['tz'] = tz or pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz'] or "UTC" timestamp = datetime.datetime.strptime(dt, tools.DEFAULT_SERVER_DATETIME_FORMAT) - ts = openerp.osv.fields.datetime.context_timestamp(cr, uid, timestamp, context) + ts = osv.fields.datetime.context_timestamp(cr, uid, timestamp, context) # Babel allows to format datetime in a specific language without change locale # So month 1 = January in English, and janvier in French diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 4ab3841a9c8..f66a171342a 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 import datetime @@ -6,7 +7,6 @@ import dateutil import email import json import lxml -from lxml import etree import logging import pytz import re @@ -17,13 +17,12 @@ import xmlrpclib from collections import namedtuple from email.message import Message from email.utils import formataddr +from lxml import etree from werkzeug import url_encode -from openerp import _, api, fields, models -from openerp import exceptions -from openerp import tools -from openerp.addons.mail.models.mail_message import decode -from openerp.tools.safe_eval import safe_eval as eval +from odoo import _, api, exceptions, fields, models, tools +from odoo.addons.mail.models.mail_message import decode +from odoo.tools.safe_eval import safe_eval as eval _logger = logging.getLogger(__name__) @@ -1837,7 +1836,7 @@ class MailThread(models.AbstractModel): handle ir ui views. """ values = kwargs.pop('values', None) or dict() try: - from openerp.addons.website.models.website import slug + from odoo.addons.website.models.website import slug values['slug'] = slug except ImportError: values['slug'] = lambda self: self.id diff --git a/addons/mail/models/mail_tracking_value.py b/addons/mail/models/mail_tracking_value.py index 72f2c2d003e..6296dc2a194 100644 --- a/addons/mail/models/mail_tracking_value.py +++ b/addons/mail/models/mail_tracking_value.py @@ -1,6 +1,9 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from datetime import datetime -from openerp import api, fields, models, tools +from odoo import api, fields, models, tools class MailTracking(models.Model): diff --git a/addons/mail/models/res_config.py b/addons/mail/models/res_config.py index d413f03f0e5..d34a6663a4f 100644 --- a/addons/mail/models/res_config.py +++ b/addons/mail/models/res_config.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import urlparse import datetime -from openerp import api, fields, models, tools +from odoo import api, fields, models, tools class BaseConfiguration(models.TransientModel): diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 4f17ecb8106..6d624ed0517 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import logging import threading -from openerp import _, api, fields, models, tools -from openerp.osv import expression +from odoo import _, api, fields, models +from odoo.osv import expression _logger = logging.getLogger(__name__) + class Partner(models.Model): """ Update partner to add a field about notification preferences. Add a generic opt-out field that can be used to restrict usage of automatic email templates. """ diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py index c5942457079..e188b9f9e75 100644 --- a/addons/mail/models/res_users.py +++ b/addons/mail/models/res_users.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import _, api, fields, models -import openerp +from odoo import _, api, exceptions, fields, models class Users(models.Model): @@ -47,7 +47,7 @@ class Users(models.Model): if not values.get('login', False): action = self.env.ref('base.action_res_users') msg = _("You cannot create a new user from here.\n To create new user please go to configuration panel.") - raise openerp.exceptions.RedirectWarning(msg, action.id, _('Go to the configuration panel')) + raise exceptions.RedirectWarning(msg, action.id, _('Go to the configuration panel')) user = super(Users, self).create(values) diff --git a/addons/mail/models/update.py b/addons/mail/models/update.py index d8e7875c62e..eb55684f14b 100644 --- a/addons/mail/models/update.py +++ b/addons/mail/models/update.py @@ -1,21 +1,25 @@ # -*- coding: utf-8 -*- -from ast import literal_eval +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import datetime -from functools import partial import logging import werkzeug.urls import urllib2 -from openerp import release, SUPERUSER_ID -from openerp.models import AbstractModel -from openerp.tools.translate import _ -from openerp.tools.config import config -from openerp.tools import misc -from openerp.exceptions import UserError +from ast import literal_eval +from functools import partial + +from odoo import release, SUPERUSER_ID +from odoo.exceptions import UserError +from odoo.models import AbstractModel +from odoo.tools.translate import _ +from odoo.tools import config +from odoo.tools import misc _logger = logging.getLogger(__name__) -class publisher_warranty_contract(AbstractModel): + +class PublisherWarrantyContract(AbstractModel): _name = "publisher_warranty.contract" def _get_message(self, cr, uid): diff --git a/addons/mail/tests/test_invite.py b/addons/mail/tests/test_invite.py index 8c8da40d388..45f50767bb5 100644 --- a/addons/mail/tests/test_invite.py +++ b/addons/mail/tests/test_invite.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from .common import TestMail -from openerp.tools import mute_logger +from odoo.addons.mail.tests.common import TestMail +from odoo.tools import mute_logger class TestInvite(TestMail): diff --git a/addons/mail/tests/test_ir_actions.py b/addons/mail/tests/test_ir_actions.py index 3748fdb715b..5c482c1aacb 100644 --- a/addons/mail/tests/test_ir_actions.py +++ b/addons/mail/tests/test_ir_actions.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.base.tests.test_ir_actions import TestServerActionsBase +from odoo.addons.base.tests.test_ir_actions import TestServerActionsBase class TestServerActionsEmail(TestServerActionsBase): diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py index 2766d0d7ced..2a003a747ed 100644 --- a/addons/mail/tests/test_mail_features.py +++ b/addons/mail/tests/test_mail_features.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from .common import TestMail -from openerp.tools import mute_logger +from odoo.addons.mail.tests.common import TestMail +from odoo.tools import mute_logger class TestMailFeatures(TestMail): diff --git a/addons/mail/tests/test_mail_followers.py b/addons/mail/tests/test_mail_followers.py index d987feb59e7..5ea0667d7eb 100644 --- a/addons/mail/tests/test_mail_followers.py +++ b/addons/mail/tests/test_mail_followers.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. from psycopg2 import IntegrityError -from openerp.addons.mail.tests.common import TestMail + +from odoo.addons.mail.tests.common import TestMail class TestMailFollowers(TestMail): diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index b8626ca1b3d..147d0ed6c81 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from email.utils import formataddr - -from .common import TestMail -from openerp.tools import mute_logger import socket +from odoo.addons.mail.tests.common import TestMail +from odoo.tools import mute_logger + + MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com> To: {to} cc: {cc} diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py index 6407d97c9cf..3df8b40a9b9 100644 --- a/addons/mail/tests/test_mail_message.py +++ b/addons/mail/tests/test_mail_message.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from .common import TestMail -from openerp.exceptions import AccessError -from openerp.exceptions import except_orm -from openerp.tools import mute_logger +from odoo.addons.mail.tests.common import TestMail +from odoo.exceptions import AccessError, except_orm +from odoo.tools import mute_logger class TestMailMessage(TestMail): diff --git a/addons/mail/tests/test_mail_template.py b/addons/mail/tests/test_mail_template.py index 485f81bb519..35f42516d8b 100644 --- a/addons/mail/tests/test_mail_template.py +++ b/addons/mail/tests/test_mail_template.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 import datetime -from openerp.addons.mail.tests.common import TestMail -from openerp.tools import mute_logger +from odoo.addons.mail.tests.common import TestMail +from odoo.tools import mute_logger class TestMailTemplate(TestMail): diff --git a/addons/mail/tests/test_message_read.py b/addons/mail/tests/test_message_read.py index 86b7613f3aa..16e99863a5f 100644 --- a/addons/mail/tests/test_message_read.py +++ b/addons/mail/tests/test_message_read.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from .common import TestMail -from openerp.tools import mute_logger +from odoo.addons.mail.tests.common import TestMail +from odoo.tools import mute_logger class TestMessageRead(TestMail): diff --git a/addons/mail/wizard/email_template_preview.py b/addons/mail/wizard/email_template_preview.py index 627611c604d..678dbfa3ee5 100644 --- a/addons/mail/wizard/email_template_preview.py +++ b/addons/mail/wizard/email_template_preview.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import api, fields, models +from odoo import api, fields, models class TemplatePreview(models.TransientModel): diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index bb6e8e9aeb4..a70b98f53e0 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import _, api, fields, models +from odoo import _, api, fields, models class Invite(models.TransientModel): diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 6537d6d1cf6..5e893c9124b 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 import re -from openerp import _, api, fields, models, SUPERUSER_ID -from openerp import tools -from openerp.tools.safe_eval import safe_eval as eval +from odoo import _, api, fields, models, SUPERUSER_ID, tools +from odoo.tools.safe_eval import safe_eval as eval # main mako-like expression pattern |