From c8a313d51e57e9db52758a2c92c13044efef5a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 9 Aug 2016 16:17:17 +0200 Subject: [PATCH] [IMP] various: use odoo for imports instead of openerp and update class names --- addons/account_asset/models/account.py | 2 +- addons/account_asset/models/product.py | 2 +- .../account_bank_statement_import.py | 6 +-- .../account_journal.py | 3 +- .../wizard/journal_creation.py | 5 ++- addons/account_budget/tests/common.py | 3 +- .../data/accounting_assert_test_data.xml | 2 +- .../wizard/base_gengo_translations.py | 2 +- addons/base_geolocalize/models/res_partner.py | 4 +- addons/bus/controllers/main.py | 15 ++++--- addons/bus/models/bus_presence.py | 9 ++-- addons/bus/models/res_partner.py | 6 +-- addons/bus/models/res_users.py | 6 +-- addons/calendar/controllers/bus.py | 7 +-- addons/calendar/models/ir_http.py | 6 +-- addons/crm/tests/test_crm_ui.py | 10 +++-- addons/crm/wizard/crm_lead_lost.py | 3 +- .../tests/test_qweb_float.py | 3 +- addons/delivery/models/delivery_carrier.py | 7 +-- addons/delivery/models/delivery_price_rule.py | 4 +- addons/delivery/models/partner.py | 2 +- addons/delivery/models/product_packaging.py | 3 +- addons/delivery/models/product_template.py | 2 +- addons/delivery/models/sale_order.py | 6 +-- addons/delivery/models/stock_move.py | 4 +- addons/delivery/models/stock_picking.py | 6 +-- addons/delivery/tests/test_delivery_cost.py | 4 +- .../tests/test_delivery_stock_move.py | 2 +- addons/event/models/event.py | 21 ++++----- .../event/report/report_event_registration.py | 6 +-- addons/event/tests/__init__.py | 3 +- addons/event/tests/common.py | 5 +-- addons/event/tests/test_event_flow.py | 6 +-- addons/event/tests/test_mail_schedule.py | 6 +-- addons/event/wizard/event_confirm.py | 2 +- .../wizard/event_edit_registration.py | 6 +-- addons/hr/models/res_partner.py | 2 + addons/hr_expense/models/account_move_line.py | 5 ++- addons/hr_expense/models/hr_department.py | 2 +- addons/hr_expense/models/hr_expense.py | 3 +- addons/hr_expense/models/product_template.py | 2 +- addons/hr_expense/models/res_config.py | 2 +- addons/hr_expense/models/web_planner.py | 3 +- addons/hr_expense/tests/test_expenses.py | 5 ++- .../wizard/hr_expense_register_payment.py | 2 +- .../tests/test_hr_payroll_account.py | 6 +-- addons/hr_recruitment/models/hr_department.py | 3 +- addons/hr_recruitment/models/hr_employee.py | 4 +- addons/hr_recruitment/models/hr_job.py | 2 +- .../hr_recruitment/models/hr_recruitment.py | 8 ++-- .../models/hr_recruitment_config_settings.py | 8 ++-- .../report/hr_recruitment_report.py | 6 +-- addons/hr_timesheet/hr_timesheet.py | 2 +- addons/hr_timesheet/project_timesheet.py | 9 ++-- addons/hr_timesheet/report/project_report.py | 13 +++--- .../report/hr_timesheet_attendance_report.py | 3 +- addons/im_livechat/controllers/main.py | 11 +++-- .../im_livechat/models/im_livechat_channel.py | 9 ++-- addons/im_livechat/models/mail_channel.py | 4 +- addons/im_livechat/models/rating.py | 4 +- .../report/im_livechat_report_channel.py | 4 +- .../report/im_livechat_report_operator.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 7 ++- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../1.0/post-migrate_tags_on_taxes.py | 4 +- .../9.0/post-migrate_tags_on_taxes.py | 4 +- .../9.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../1.0/post-migrate_tags_on_taxes.py | 4 +- .../13.0/post-migrate_tags_on_taxes.py | 4 +- .../13.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/post-migrate_tags_on_taxes.py | 4 +- .../2.0/pre-set_tags_and_taxes_updatable.py | 4 +- addons/link_tracker/controller/main.py | 8 ++-- addons/link_tracker/models/link_tracker.py | 6 ++- addons/lunch/models/lunch.py | 7 +-- addons/lunch/tests/test_lunch.py | 3 +- addons/lunch/wizard/lucky_order.py | 16 ++++--- addons/mail/controllers/bus.py | 16 +++---- addons/mail/controllers/main.py | 25 +++++------ addons/mail/models/ir_actions.py | 5 ++- addons/mail/models/ir_autovacuum.py | 3 +- addons/mail/models/mail_alias.py | 10 ++--- addons/mail/models/mail_channel.py | 12 +++--- addons/mail/models/mail_followers.py | 3 +- addons/mail/models/mail_mail.py | 12 +++--- addons/mail/models/mail_message.py | 11 ++--- addons/mail/models/mail_message_subtype.py | 3 +- addons/mail/models/mail_shortcode.py | 4 +- addons/mail/models/mail_template.py | 12 +++--- addons/mail/models/mail_thread.py | 13 +++--- addons/mail/models/mail_tracking_value.py | 5 ++- addons/mail/models/res_config.py | 3 +- addons/mail/models/res_partner.py | 6 ++- addons/mail/models/res_users.py | 6 +-- addons/mail/models/update.py | 22 ++++++---- addons/mail/tests/test_invite.py | 5 ++- addons/mail/tests/test_ir_actions.py | 3 +- addons/mail/tests/test_mail_features.py | 5 ++- addons/mail/tests/test_mail_followers.py | 4 +- addons/mail/tests/test_mail_gateway.py | 9 ++-- addons/mail/tests/test_mail_message.py | 8 ++-- addons/mail/tests/test_mail_template.py | 5 ++- addons/mail/tests/test_message_read.py | 5 ++- addons/mail/wizard/email_template_preview.py | 3 +- addons/mail/wizard/invite.py | 3 +- addons/mail/wizard/mail_compose_message.py | 6 +-- addons/maintenance/tests/test_maintenance.py | 4 +- .../models/marketing_campaign.py | 6 +-- addons/mass_mailing/models/link_tracker.py | 2 + addons/mrp/models/mrp_routing.py | 2 +- addons/mrp/report/bom_cost.py | 2 +- addons/mrp/tests/test_multicompany.py | 2 +- addons/mrp/tests/test_workorder_operation.py | 4 +- .../mrp_byproduct/tests/test_mrp_byproduct.py | 2 +- addons/point_of_sale/tests/test_frontend.py | 7 ++- .../tests/test_point_of_sale_ui.py | 10 +++-- addons/pos_cache/models/pos_cache.py | 5 ++- addons/pos_mercury/models/pos_mercury.py | 26 ++++++----- .../models/pos_mercury_transaction.py | 10 +++-- addons/procurement/models/procurement.py | 5 ++- addons/procurement_jit/sale.py | 5 ++- .../product_margin/wizard/product_margin.py | 3 +- .../models/product_pricelist.py | 3 +- .../models/sale_order.py | 2 +- addons/project/models/project.py | 6 +-- addons/project/tests/test_project_ui.py | 10 +++-- .../models/project_issue_config_settings.py | 3 +- addons/rating/controllers/main.py | 8 ++-- addons/rating/models/rating.py | 5 ++- addons/rating_project/models/project.py | 5 ++- .../models/project_issue.py | 5 ++- addons/resource/tests/test_resource.py | 7 ++- .../sale_expense/tests/test_sale_expense.py | 3 +- addons/sale_mrp/sale_mrp.py | 4 +- addons/sale_mrp/tests/test_move_explode.py | 2 +- addons/sale_mrp/tests/test_sale_mrp_flow.py | 6 ++- addons/sale_stock/report/sale_report.py | 3 +- addons/sale_stock/tests/test_sale_stock.py | 5 ++- addons/stock/models/procurement.py | 2 - addons/stock/models/stock_scrap.py | 4 +- addons/web/models/ir_http.py | 5 ++- addons/web/tests/test_js.py | 4 +- addons/website_blog/controllers/main.py | 14 +++--- addons/website_blog/models/mail_message.py | 3 +- addons/website_blog/models/website_blog.py | 14 +++--- addons/website_blog/tests/__init__.py | 5 ++- addons/website_blog/tests/common.py | 4 +- addons/website_blog/tests/test_ui.py | 11 +++-- .../tests/test_website_blog_flow.py | 3 +- addons/website_customer/controllers/main.py | 11 +++-- .../controllers/main.py | 7 +-- .../website_event_questions/models/event.py | 3 +- .../report_event_registrations_questions.py | 3 +- addons/website_event_track/models/event.py | 43 +++++++++---------- addons/website_form/controllers/main.py | 18 +++++--- addons/website_form/models/models.py | 6 ++- addons/website_forum/controllers/main.py | 27 ++++++------ addons/website_forum/models/forum.py | 14 +++--- addons/website_forum/models/gamification.py | 4 +- addons/website_forum/models/res_users.py | 6 ++- addons/website_forum/tests/common.py | 3 +- addons/website_forum/tests/test_forum.py | 5 ++- .../website_forum/tests/test_forum_process.py | 11 +++-- .../controllers/main.py | 12 +++--- .../tests/test_website_hr_recruitment.py | 14 +++--- addons/website_links/controller/main.py | 8 ++-- addons/website_livechat/controllers/main.py | 5 ++- addons/website_livechat/models/im_livechat.py | 8 ++-- addons/website_livechat/models/website.py | 7 +-- addons/website_payment/controllers/main.py | 9 ++-- addons/website_payment/models/res_config.py | 5 ++- addons/website_payment/models/website.py | 5 ++- .../tests/test_access_rights.py | 2 +- .../website_project_issue/controllers/main.py | 7 ++- .../models/project_issue.py | 2 +- .../tests/test_access_rights.py | 7 +-- .../controllers/main.py | 9 ++-- .../models/project.py | 4 +- .../tests/test_customize.py | 11 +++-- addons/website_slides/controllers/main.py | 11 ++--- addons/website_slides/models/res_config.py | 3 +- addons/website_slides/models/slides.py | 18 ++++---- .../models/ir_module_module.py | 7 ++- 197 files changed, 695 insertions(+), 542 deletions(-) diff --git a/addons/account_asset/models/account.py b/addons/account_asset/models/account.py index a0e7f76d459..7a2a3bc4968 100644 --- a/addons/account_asset/models/account.py +++ b/addons/account_asset/models/account.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 +from odoo import api, fields, models class AccountMove(models.Model): diff --git a/addons/account_asset/models/product.py b/addons/account_asset/models/product.py index 42472f88e5d..0934a95f4bc 100644 --- a/addons/account_asset/models/product.py +++ b/addons/account_asset/models/product.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 +from odoo import api, fields, models class ProductTemplate(models.Model): diff --git a/addons/account_bank_statement_import/account_bank_statement_import.py b/addons/account_bank_statement_import/account_bank_statement_import.py index 0d512a119c9..32e1e9ce5d5 100644 --- a/addons/account_bank_statement_import/account_bank_statement_import.py +++ b/addons/account_bank_statement_import/account_bank_statement_import.py @@ -2,9 +2,9 @@ import base64 -from openerp import api, fields, models, _ -from openerp.exceptions import UserError -from openerp.addons.base.res.res_bank import sanitize_account_number +from odoo import api, fields, models, _ +from odoo.exceptions import UserError +from odoo.addons.base.res.res_bank import sanitize_account_number import logging _logger = logging.getLogger(__name__) diff --git a/addons/account_bank_statement_import/account_journal.py b/addons/account_bank_statement_import/account_journal.py index 0ddb88713fd..59864427888 100644 --- a/addons/account_bank_statement_import/account_journal.py +++ b/addons/account_bank_statement_import/account_journal.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -from openerp import models, fields, api +from odoo import models, fields, api + class AccountJournal(models.Model): _inherit = "account.journal" diff --git a/addons/account_bank_statement_import/wizard/journal_creation.py b/addons/account_bank_statement_import/wizard/journal_creation.py index 82417ecb661..d5572980e42 100644 --- a/addons/account_bank_statement_import/wizard/journal_creation.py +++ b/addons/account_bank_statement_import/wizard/journal_creation.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -from openerp import api, fields, models +from odoo import api, fields, models -class account_bank_statement_import_journal_creation(models.TransientModel): + +class AccountBankStatementImportJounalCreation(models.TransientModel): _name = 'account.bank.statement.import.journal.creation' _description = 'Import Bank Statement Journal Creation Wizard' diff --git a/addons/account_budget/tests/common.py b/addons/account_budget/tests/common.py index 55774dd2f49..17951313f27 100644 --- a/addons/account_budget/tests/common.py +++ b/addons/account_budget/tests/common.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.account.tests.account_test_classes import AccountingTestCase +from odoo.addons.account.tests.account_test_classes import AccountingTestCase import time + class TestAccountBudgetCommon(AccountingTestCase): def setUp(self): diff --git a/addons/account_test/data/accounting_assert_test_data.xml b/addons/account_test/data/accounting_assert_test_data.xml index 89491b6a292..a0cfbf17c4c 100644 --- a/addons/account_test/data/accounting_assert_test_data.xml +++ b/addons/account_test/data/accounting_assert_test_data.xml @@ -100,7 +100,7 @@ if res: Test 6 : Invoices status Check that paid/reconciled invoices are not in 'Open' state ', type='http', auth='none', website=True) def full_url_redirect(self, code, **post): request.env['link.tracker.click'].add_click(code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=False) diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py index 4de629fc517..7b30151ca66 100644 --- a/addons/link_tracker/models/link_tracker.py +++ b/addons/link_tracker/models/link_tracker.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import datetime import random import re @@ -10,8 +12,8 @@ from urlparse import urljoin from urlparse import urlparse from werkzeug import url_encode -from openerp import models, fields, api, _ -from openerp.tools import ustr +from odoo import models, fields, api, _ +from odoo.tools import ustr URL_REGEX = r'(\bhref=[\'"](?!mailto:)([^\'"]+)[\'"])' diff --git a/addons/lunch/models/lunch.py b/addons/lunch/models/lunch.py index ee5437fbdd2..64ddc393818 100644 --- a/addons/lunch/models/lunch.py +++ b/addons/lunch/models/lunch.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import datetime -from openerp import models, fields, api, _ -import openerp.addons.decimal_precision as dp -from openerp.exceptions import AccessError, ValidationError +from odoo import api, fields, models, _ +from odoo.exceptions import AccessError, ValidationError +import odoo.addons.decimal_precision as dp class LunchOrder(models.Model): diff --git a/addons/lunch/tests/test_lunch.py b/addons/lunch/tests/test_lunch.py index 6b7ea1f8461..0dc1900b310 100644 --- a/addons/lunch/tests/test_lunch.py +++ b/addons/lunch/tests/test_lunch.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common class Test_Lunch(common.TransactionCase): diff --git a/addons/lunch/wizard/lucky_order.py b/addons/lunch/wizard/lucky_order.py index 7583fbe6f72..0533de5b4ee 100644 --- a/addons/lunch/wizard/lucky_order.py +++ b/addons/lunch/wizard/lucky_order.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import api, fields, models, _ import random -from openerp.exceptions import UserError -class lunch_order_line(models.TransientModel): +from odoo import api, fields, models, _ +from odoo.exceptions import UserError + + +class LunchOrderLineLucky(models.TransientModel): _name = 'lunch.order.line.lucky' def _default_supplier(self): @@ -16,7 +18,7 @@ class lunch_order_line(models.TransientModel): supplier_ids = fields.Many2many(comodel_name='res.partner', string='Vendor', domain=lambda self: [("id", "in", self.env['lunch.product'].search([]).mapped("supplier").ids)]) is_max_budget = fields.Boolean("I'm not feeling rich", help="Enable this option to set a maximal budget for your lucky order.", store=True) max_budget = fields.Float('Max Budget', store=True) - + @api.multi def random_pick(self): """ @@ -24,13 +26,13 @@ class lunch_order_line(models.TransientModel): """ self.ensure_one() if self.is_max_budget: - products_obj = self.env['lunch.product'].search([('supplier', "in", self.supplier_ids.ids), ('price', '<=', self.max_budget)]) + products_obj = self.env['lunch.product'].search([('supplier', "in", self.supplier_ids.ids), ('price', '<=', self.max_budget)]) else: - products_obj = self.env['lunch.product'].search([('supplier', "in", self.supplier_ids.ids)]) + products_obj = self.env['lunch.product'].search([('supplier', "in", self.supplier_ids.ids)]) if len(products_obj) != 0: random_product_obj = self.env['lunch.product'].browse([random.choice(products_obj.ids)]) order_line = self.env['lunch.order.line'].create({ - 'product_id': random_product_obj.id, + 'product_id': random_product_obj.id, 'order_id': self._context['active_id'] }) else: 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 operator import itemgetter 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 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: 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 diff --git a/addons/maintenance/tests/test_maintenance.py b/addons/maintenance/tests/test_maintenance.py index 5935b012996..11aae3d6986 100644 --- a/addons/maintenance/tests/test_maintenance.py +++ b/addons/maintenance/tests/test_maintenance.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests.common import TransactionCase import time +from odoo.tests.common import TransactionCase + class TestEquipment(TransactionCase): """ Test used to check that when doing equipment/maintenance_request/equipment_category creation.""" diff --git a/addons/marketing_campaign/models/marketing_campaign.py b/addons/marketing_campaign/models/marketing_campaign.py index 45deeda41ec..ef648fb0c31 100644 --- a/addons/marketing_campaign/models/marketing_campaign.py +++ b/addons/marketing_campaign/models/marketing_campaign.py @@ -1,18 +1,17 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import time -from datetime import datetime from dateutil.relativedelta import relativedelta from traceback import format_exception from sys import exc_info + import re -import openerp.addons.decimal_precision as dp from odoo import api, fields, models, _ from odoo.exceptions import UserError, ValidationError from odoo.tools.safe_eval import safe_eval as eval +import odoo.addons.decimal_precision as dp _intervalTypes = { 'hours': lambda interval: relativedelta(hours=interval), @@ -21,6 +20,7 @@ _intervalTypes = { 'years': lambda interval: relativedelta(years=interval), } + class MarketingCampaign(models.Model): _name = "marketing.campaign" _description = "Marketing Campaign" diff --git a/addons/mass_mailing/models/link_tracker.py b/addons/mass_mailing/models/link_tracker.py index 0ca1b0f7e5c..2ced9d90992 100644 --- a/addons/mass_mailing/models/link_tracker.py +++ b/addons/mass_mailing/models/link_tracker.py @@ -3,12 +3,14 @@ from odoo import fields, models + class LinkTracker(models.Model): _inherit = "link.tracker" mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing') mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') + class LinkTrackerClick(models.Model): _inherit = "link.tracker.click" diff --git a/addons/mrp/models/mrp_routing.py b/addons/mrp/models/mrp_routing.py index f904d8ee2e1..b9effeadd8d 100644 --- a/addons/mrp/models/mrp_routing.py +++ b/addons/mrp/models/mrp_routing.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, _ +from odoo import api, fields, models, _ class MrpRouting(models.Model): diff --git a/addons/mrp/report/bom_cost.py b/addons/mrp/report/bom_cost.py index f299ed4ba1b..54cd5ea21b7 100644 --- a/addons/mrp/report/bom_cost.py +++ b/addons/mrp/report/bom_cost.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import api, models +from odoo import api, models class MrpBomCost(models.AbstractModel): diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py index e67c36271c5..56052b566f0 100644 --- a/addons/mrp/tests/test_multicompany.py +++ b/addons/mrp/tests/test_multicompany.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common class TestMrpMulticompany(common.TransactionCase): diff --git a/addons/mrp/tests/test_workorder_operation.py b/addons/mrp/tests/test_workorder_operation.py index b773f1fcca7..00541dfc8df 100644 --- a/addons/mrp/tests/test_workorder_operation.py +++ b/addons/mrp/tests/test_workorder_operation.py @@ -1,5 +1,7 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common class TestWorkOrderProcess(common.TransactionCase): diff --git a/addons/mrp_byproduct/tests/test_mrp_byproduct.py b/addons/mrp_byproduct/tests/test_mrp_byproduct.py index 457dc719dd2..2b20b116fe8 100644 --- a/addons/mrp_byproduct/tests/test_mrp_byproduct.py +++ b/addons/mrp_byproduct/tests/test_mrp_byproduct.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common class TestMrpByProduct(common.TransactionCase): diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py index 0637d471a3a..885b5af6d80 100644 --- a/addons/point_of_sale/tests/test_frontend.py +++ b/addons/point_of_sale/tests/test_frontend.py @@ -1,5 +1,10 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.api import Environment + import odoo.tests -from openerp.api import Environment + class TestUi(odoo.tests.HttpCase): def test_01_pos_basic_order(self): diff --git a/addons/point_of_sale/tests/test_point_of_sale_ui.py b/addons/point_of_sale/tests/test_point_of_sale_ui.py index 217d8b83265..3be0d3095e6 100644 --- a/addons/point_of_sale/tests/test_point_of_sale_ui.py +++ b/addons/point_of_sale/tests/test_point_of_sale_ui.py @@ -1,9 +1,11 @@ -import openerp.tests # Part of Odoo. See LICENSE file for full copyright and licensing details. -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestUi(openerp.tests.HttpCase): +import odoo.tests + + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestUi(odoo.tests.HttpCase): def test_01_point_of_sale_tour(self): self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('point_of_sale_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.point_of_sale_tour", login="admin") diff --git a/addons/pos_cache/models/pos_cache.py b/addons/pos_cache/models/pos_cache.py index d90966ce5a4..bee2c184594 100644 --- a/addons/pos_cache/models/pos_cache.py +++ b/addons/pos_cache/models/pos_cache.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. + from ast import literal_eval -from openerp import models, fields, api -from openerp.tools import pickle as cPickle +from odoo import models, fields, api +from odoo.tools import pickle as cPickle class pos_cache(models.Model): diff --git a/addons/pos_mercury/models/pos_mercury.py b/addons/pos_mercury/models/pos_mercury.py index 11171982ba9..707f85692e0 100644 --- a/addons/pos_mercury/models/pos_mercury.py +++ b/addons/pos_mercury/models/pos_mercury.py @@ -3,27 +3,28 @@ import logging -from openerp import models, fields, api, _ +from odoo import models, fields, api, _ _logger = logging.getLogger(__name__) -class barcode_rule(models.Model): + +class BarcodeRule(models.Model): _inherit = 'barcode.rule' type = fields.Selection(selection_add=[ - ('credit', _('Credit Card')) - ]) + ('credit', _('Credit Card')) + ]) -class pos_mercury_payment_data(models.Model): +class PosMercuryConfiguration(models.Model): _name = 'pos_mercury.configuration' - # FIELDS # name = fields.Char(required=True, help='Name of this Mercury configuration') merchant_id = fields.Char(string='Merchant ID', required=True, help='ID of the merchant to authenticate him on the payment provider server') merchant_pwd = fields.Char(string='Merchant Password', required=True, help='Password of the merchant to authenticate him on the payment provider server') -class account_bank_statement_line(models.Model): + +class AccountBankStatementLine(models.Model): _inherit = "account.bank.statement.line" mercury_card_number = fields.Char(string='Card Number', help='The last 4 numbers of the card used to pay') @@ -41,17 +42,19 @@ class account_bank_statement_line(models.Model): else: self.mercury_prefixed_card_number = "" -class account_journal(models.Model): + +class AccountJournal(models.Model): _inherit = 'account.journal' pos_mercury_config_id = fields.Many2one('pos_mercury.configuration', string='Mercury configuration', help='The configuration of Mercury used for this journal') -class pos_order_card(models.Model): + +class PosOrder(models.Model): _inherit = "pos.order" @api.model def _payment_fields(self, ui_paymentline): - fields = super(pos_order_card, self)._payment_fields(ui_paymentline) + fields = super(PosOrder, self)._payment_fields(ui_paymentline) fields.update({ 'card_number': ui_paymentline.get('mercury_card_number'), @@ -65,7 +68,7 @@ class pos_order_card(models.Model): return fields def add_payment(self, data): - statement_id = super(pos_order_card, self).add_payment(data) + statement_id = super(PosOrder, self).add_payment(data) statement_lines = self.env['account.bank.statement.line'].search([('statement_id', '=', statement_id), ('pos_statement_id', '=', self.id), ('journal_id', '=', data['journal']), @@ -89,6 +92,7 @@ class pos_order_card(models.Model): return statement_id + class AutoVacuum(models.AbstractModel): _inherit = 'ir.autovacuum' diff --git a/addons/pos_mercury/models/pos_mercury_transaction.py b/addons/pos_mercury/models/pos_mercury_transaction.py index 05d7efdf265..36748c5ea0c 100644 --- a/addons/pos_mercury/models/pos_mercury_transaction.py +++ b/addons/pos_mercury/models/pos_mercury_transaction.py @@ -1,15 +1,17 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from datetime import date, timedelta + import cgi import urllib2 import ssl import werkzeug -from datetime import date, timedelta -from openerp import models, api, service -from openerp.exceptions import UserError -from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT +from odoo import models, api, service +from odoo.exceptions import UserError +from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT + class MercuryTransaction(models.Model): _name = 'pos_mercury.mercury_transaction' diff --git a/addons/procurement/models/procurement.py b/addons/procurement/models/procurement.py index 6144972f4fd..ec0bd14ae20 100644 --- a/addons/procurement/models/procurement.py +++ b/addons/procurement/models/procurement.py @@ -4,8 +4,9 @@ from psycopg2 import OperationalError from odoo import api, fields, models, registry, _ -import openerp.addons.decimal_precision as dp -from openerp.exceptions import UserError +from odoo.exceptions import UserError + +import odoo.addons.decimal_precision as dp PROCUREMENT_PRIORITIES = [('0', 'Not urgent'), ('1', 'Normal'), ('2', 'Urgent'), ('3', 'Very Urgent')] diff --git a/addons/procurement_jit/sale.py b/addons/procurement_jit/sale.py index b7ab9d40433..35537fe451e 100644 --- a/addons/procurement_jit/sale.py +++ b/addons/procurement_jit/sale.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 odoo import api, models + class SaleOrderLine(models.Model): _inherit = "sale.order.line" @@ -15,4 +16,4 @@ class SaleOrderLine(models.Model): if reassign: reassign.do_unreserve() reassign.action_assign() - return res \ No newline at end of file + return res diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py index dba552e6a32..b5cc892ea7a 100644 --- a/addons/product_margin/wizard/product_margin.py +++ b/addons/product_margin/wizard/product_margin.py @@ -3,8 +3,7 @@ import time -from odoo import api, fields, models -from openerp.tools.translate import _ +from odoo import api, fields, models, _ class ProductMargin(models.TransientModel): diff --git a/addons/product_visible_discount/models/product_pricelist.py b/addons/product_visible_discount/models/product_pricelist.py index d32640aab8f..0bd379641b7 100644 --- a/addons/product_visible_discount/models/product_pricelist.py +++ b/addons/product_visible_discount/models/product_pricelist.py @@ -1,7 +1,8 @@ # -*- 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 ProductPricelist(models.Model): _inherit = 'product.pricelist' diff --git a/addons/product_visible_discount/models/sale_order.py b/addons/product_visible_discount/models/sale_order.py index 6a27e82bd78..3c9964136dd 100644 --- a/addons/product_visible_discount/models/sale_order.py +++ b/addons/product_visible_discount/models/sale_order.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 +from odoo import api, models class SaleOrderLine(models.Model): diff --git a/addons/project/models/project.py b/addons/project/models/project.py index a2a17937ff4..d49ab24724a 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -3,9 +3,9 @@ from lxml import etree -from odoo import api, fields, models, tools, SUPERUSER_ID, _ -from openerp.tools.safe_eval import safe_eval as eval -from openerp.exceptions import UserError, ValidationError +from odoo import api, fields, models, tools, _ +from odoo.exceptions import UserError, ValidationError +from odoo.tools.safe_eval import safe_eval as eval class ProjectTaskType(models.Model): diff --git a/addons/project/tests/test_project_ui.py b/addons/project/tests/test_project_ui.py index 73d308f67a2..4246f0ebb10 100644 --- a/addons/project/tests/test_project_ui.py +++ b/addons/project/tests/test_project_ui.py @@ -1,9 +1,11 @@ -import openerp.tests # Part of Odoo. See LICENSE file for full copyright and licensing details. -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestUi(openerp.tests.HttpCase): +import odoo.tests + + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestUi(odoo.tests.HttpCase): def test_01_project_tour(self): self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('project_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.project_tour", login="admin") diff --git a/addons/project_issue/models/project_issue_config_settings.py b/addons/project_issue/models/project_issue_config_settings.py index 72c8cb04cba..dbe8505a3b5 100644 --- a/addons/project_issue/models/project_issue_config_settings.py +++ b/addons/project_issue/models/project_issue_config_settings.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import models, fields +from odoo import models, fields + class ProjectIssueConfiguration(models.TransientModel): _inherit = 'project.config.settings' diff --git a/addons/rating/controllers/main.py b/addons/rating/controllers/main.py index 5833b4633a8..cbd28e175aa 100644 --- a/addons/rating/controllers/main.py +++ b/addons/rating/controllers/main.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import werkzeug -from openerp import http -from openerp.http import request -from openerp.tools.translate import _ +from odoo import http +from odoo.http import request +from odoo.tools.translate import _ + class Rating(http.Controller): diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py index 9df19846f77..fb7f03494b1 100644 --- a/addons/rating/models/rating.py +++ b/addons/rating/models/rating.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import uuid -from odoo import api, fields, models -from openerp import tools +from odoo import api, fields, models, tools class Rating(models.Model): @@ -47,6 +47,7 @@ class Rating(models.Model): 'consumed': False, }) + class RatingMixin(models.AbstractModel): _name = 'rating.mixin' _description = "Rating Mixin" diff --git a/addons/rating_project/models/project.py b/addons/rating_project/models/project.py index 56bf9637ef7..3a981885686 100644 --- a/addons/rating_project/models/project.py +++ b/addons/rating_project/models/project.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from datetime import timedelta -from openerp import api, fields, models, _ + +from odoo import api, fields, models class ProjectTaskType(models.Model): diff --git a/addons/rating_project_issue/models/project_issue.py b/addons/rating_project_issue/models/project_issue.py index 32b5c149df7..f771f328f84 100644 --- a/addons/rating_project_issue/models/project_issue.py +++ b/addons/rating_project_issue/models/project_issue.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from datetime import timedelta -from openerp import api, fields, models + +from odoo import api, fields, models class ProjectIssue(models.Model): diff --git a/addons/resource/tests/test_resource.py b/addons/resource/tests/test_resource.py index 3f2caa1d71e..2a4f9ee109f 100644 --- a/addons/resource/tests/test_resource.py +++ b/addons/resource/tests/test_resource.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from datetime import datetime, timedelta, date - import babel.dates + +from datetime import datetime, timedelta, date from dateutil.relativedelta import relativedelta from odoo.fields import Datetime from odoo.tools import float_compare from odoo.addons.resource.tests.common import TestResourceCommon - -from openerp.tests import TransactionCase +from odoo.tests import TransactionCase class TestResource(TestResourceCommon): diff --git a/addons/sale_expense/tests/test_sale_expense.py b/addons/sale_expense/tests/test_sale_expense.py index 0152f4df845..fdc1317cf57 100644 --- a/addons/sale_expense/tests/test_sale_expense.py +++ b/addons/sale_expense/tests/test_sale_expense.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.sale.tests.test_sale_common import TestSale + +from odoo.addons.sale.tests.test_sale_common import TestSale class TestSaleExpense(TestSale): diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py index 1b734ed35d2..2247c8f7604 100644 --- a/addons/sale_mrp/sale_mrp.py +++ b/addons/sale_mrp/sale_mrp.py @@ -1,8 +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.tools import float_compare +from odoo import api, fields, models +from odoo.tools import float_compare class MrpProduction(models.Model): diff --git a/addons/sale_mrp/tests/test_move_explode.py b/addons/sale_mrp/tests/test_move_explode.py index 14e947bb971..04dcaf24181 100644 --- a/addons/sale_mrp/tests/test_move_explode.py +++ b/addons/sale_mrp/tests/test_move_explode.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common class TestMoveExplode(common.TransactionCase): diff --git a/addons/sale_mrp/tests/test_sale_mrp_flow.py b/addons/sale_mrp/tests/test_sale_mrp_flow.py index 74d1da1e8f8..1cd94fcccab 100644 --- a/addons/sale_mrp/tests/test_sale_mrp_flow.py +++ b/addons/sale_mrp/tests/test_sale_mrp_flow.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common from datetime import datetime -from openerp.exceptions import UserError + +from odoo.tests import common +from odoo.exceptions import UserError class TestSaleMrpFlow(common.TransactionCase): diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py index 7220f045e53..5101af87c01 100644 --- a/addons/sale_stock/report/sale_report.py +++ b/addons/sale_stock/report/sale_report.py @@ -1,7 +1,8 @@ # -*- 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 SaleReport(models.Model): _inherit = "sale.report" diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py index e90130cb68c..f3c26ea1db2 100644 --- a/addons/sale_stock/tests/test_sale_stock.py +++ b/addons/sale_stock/tests/test_sale_stock.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.sale.tests.test_sale_common import TestSale -from openerp.exceptions import UserError + +from odoo.addons.sale.tests.test_sale_common import TestSale +from odoo.exceptions import UserError class TestSaleStock(TestSale): diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py index 56ba4e43787..a6ba9d5c004 100644 --- a/addons/stock/models/procurement.py +++ b/addons/stock/models/procurement.py @@ -10,8 +10,6 @@ from odoo import api, fields, models, registry, _ from odoo.osv import expression from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_compare, float_round -import openerp - class ProcurementGroup(models.Model): _inherit = 'procurement.group' diff --git a/addons/stock/models/stock_scrap.py b/addons/stock/models/stock_scrap.py index af18b31b0f5..a0465d5e3f8 100644 --- a/addons/stock/models/stock_scrap.py +++ b/addons/stock/models/stock_scrap.py @@ -1,8 +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 StockScrap(models.Model): diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py index 6af9431bada..aea99b06111 100644 --- a/addons/web/models/ir_http.py +++ b/addons/web/models/ir_http.py @@ -3,10 +3,11 @@ import json -import openerp from odoo import models from odoo.http import request +import odoo + class Http(models.AbstractModel): _inherit = 'ir.http' @@ -20,7 +21,7 @@ class Http(models.AbstractModel): def session_info(self): user = request.env.user display_switch_company_menu = user.has_group('base.group_multi_company') and len(user.company_ids) > 1 - version_info = openerp.service.common.exp_version() + version_info = odoo.service.common.exp_version() return { "session_id": request.session_id, "uid": request.session.uid, diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py index 1dab0f8436b..c134074e789 100644 --- a/addons/web/tests/test_js.py +++ b/addons/web/tests/test_js.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import openerp.tests +import odoo.tests -class WebSuite(openerp.tests.HttpCase): +class WebSuite(odoo.tests.HttpCase): def test_01_js(self): self.phantom_js('/web/tests?mod=web',"","", login='admin') diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 76f9df51dbd..5afb08840ea 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -1,18 +1,16 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import datetime import json import werkzeug -from openerp import tools -from openerp import http -from openerp.http import request -from openerp.addons.website.models.website import slug, unslug +from odoo import http, tools, SUPERUSER_ID, _ from odoo.addons.website.controllers.main import QueryURL -from openerp.exceptions import UserError -from openerp.tools.translate import _ -from openerp import SUPERUSER_ID -from openerp.tools import html2plaintext +from odoo.addons.website.models.website import slug, unslug +from odoo.exceptions import UserError +from odoo.http import request +from odoo.tools import html2plaintext class WebsiteBlog(http.Controller): diff --git a/addons/website_blog/models/mail_message.py b/addons/website_blog/models/mail_message.py index e1b60f6ad20..c5b1750dd09 100644 --- a/addons/website_blog/models/mail_message.py +++ b/addons/website_blog/models/mail_message.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.osv import osv, fields +from odoo.osv import osv, fields class MailMessage(osv.Model): diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index c4e0380a12e..8ec6a2e59fa 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -1,17 +1,15 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from datetime import datetime import lxml import random -from openerp import tools -from openerp import SUPERUSER_ID -from openerp.addons.website.models.website import slug -from openerp.osv import osv, fields -from openerp.tools.translate import _ -from openerp.tools.translate import html_translate +from datetime import datetime -from odoo import api +from odoo import api, tools, SUPERUSER_ID +from odoo.addons.website.models.website import slug +from odoo.osv import osv, fields +from odoo.tools.translate import _, html_translate class Blog(osv.Model): diff --git a/addons/website_blog/tests/__init__.py b/addons/website_blog/tests/__init__.py index 3d2b61f96b2..3dd8e5e199a 100644 --- a/addons/website_blog/tests/__init__.py +++ b/addons/website_blog/tests/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.website_blog.tests import test_ui -from openerp.addons.website_blog.tests import test_website_blog_flow +from odoo.addons.website_blog.tests import test_ui +from odoo.addons.website_blog.tests import test_website_blog_flow diff --git a/addons/website_blog/tests/common.py b/addons/website_blog/tests/common.py index 5dff9af2278..f5f88430b72 100644 --- a/addons/website_blog/tests/common.py +++ b/addons/website_blog/tests/common.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -from openerp.tests import common +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.tests import common class TestWebsiteBlogCommon(common.TransactionCase): diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py index 4f359565628..ef6ea770f94 100644 --- a/addons/website_blog/tests/test_ui.py +++ b/addons/website_blog/tests/test_ui.py @@ -1,7 +1,10 @@ -import openerp.tests +# Part of Odoo. See LICENSE file for full copyright and licensing details. -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestUi(openerp.tests.HttpCase): +import odoo.tests + + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestUi(odoo.tests.HttpCase): def test_admin(self): self.phantom_js("/", "odoo.__DEBUG__.services['web_tour.tour'].run('blog')", "odoo.__DEBUG__.services['web_tour.tour'].tours.blog", login='admin') diff --git a/addons/website_blog/tests/test_website_blog_flow.py b/addons/website_blog/tests/test_website_blog_flow.py index 628fe25a86d..fb25aeb5403 100644 --- a/addons/website_blog/tests/test_website_blog_flow.py +++ b/addons/website_blog/tests/test_website_blog_flow.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.website_blog.tests.common import TestWebsiteBlogCommon +from odoo.addons.website_blog.tests.common import TestWebsiteBlogCommon class TestWebsiteBlogFlow(TestWebsiteBlogCommon): diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index 9353d539a17..613f1969573 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import openerp -from openerp import SUPERUSER_ID -from openerp import http -from openerp.addons.website.models.website import unslug -from openerp.tools.translate import _ -from openerp.http import request import werkzeug.urls +from odoo import http +from odoo.addons.website.models.website import unslug +from odoo.tools.translate import _ +from odoo.http import request + class WebsiteCustomer(http.Controller): _references_per_page = 20 diff --git a/addons/website_event_questions/controllers/main.py b/addons/website_event_questions/controllers/main.py index 31ff54b45af..99c4fabe783 100644 --- a/addons/website_event_questions/controllers/main.py +++ b/addons/website_event_questions/controllers/main.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.website_event.controllers.main import WebsiteEventController +from odoo.addons.website_event.controllers.main import WebsiteEventController -class website_event(WebsiteEventController): +class WebsiteEvent(WebsiteEventController): def _process_registration_details(self, details): ''' Process data posted from the attendee details form. ''' - registrations = super(website_event, self)._process_registration_details(details) + registrations = super(WebsiteEvent, self)._process_registration_details(details) for registration in registrations: answer_ids = [] for key, value in registration.iteritems(): diff --git a/addons/website_event_questions/models/event.py b/addons/website_event_questions/models/event.py index 2093d88f5c2..c45a924ffa9 100644 --- a/addons/website_event_questions/models/event.py +++ b/addons/website_event_questions/models/event.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import models, fields +from odoo import fields, models class EventEvent(models.Model): diff --git a/addons/website_event_questions/report/report_event_registrations_questions.py b/addons/website_event_questions/report/report_event_registrations_questions.py index 0e4f949ca97..90c0e9e1350 100644 --- a/addons/website_event_questions/report/report_event_registrations_questions.py +++ b/addons/website_event_questions/report/report_event_registrations_questions.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, tools +from odoo import fields, models, tools class ReportEventRegistrationQuestions(models.Model): diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 463ec12ba9e..08d8cd35b6c 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -1,32 +1,13 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import models, fields, api -from openerp.tools.translate import _ -from openerp.addons.website.models.website import slug +from odoo import api, fields, models, _ +from odoo.addons.website.models.website import slug + class Event(models.Model): - _inherit = "event.event" - @api.multi - def _count_tracks(self): - track_data = self.env['event.track'].read_group([('state', '!=', 'cancel')], ['event_id', 'state'], ['event_id']) - result = dict((data['event_id'][0], data['event_id_count']) for data in track_data) - for event in self: - event.count_tracks = result.get(event.id, 0) - - @api.multi - def _count_sponsor(self): - for event in self: - event.count_sponsor = len(event.sponsor_ids) - - @api.multi - @api.depends('track_ids.tag_ids') - def _get_tracks_tag_ids(self): - for event in self: - event.tracks_tag_ids = event.track_ids.mapped('tag_ids').ids - track_ids = fields.One2many('event.track', 'event_id', 'Tracks') sponsor_ids = fields.One2many('event.sponsor', 'event_id', 'Sponsors') show_track_proposal = fields.Boolean('Tracks Proposals', compute='_get_show_menu', inverse='_set_show_menu', store=True) @@ -56,3 +37,21 @@ class Event(models.Model): if nbr_menu_items != len(event.menu_id.child_id): event.menu_id.unlink() return super(Event, self)._set_show_menu() + + @api.multi + def _count_tracks(self): + track_data = self.env['event.track'].read_group([('state', '!=', 'cancel')], ['event_id', 'state'], ['event_id']) + result = dict((data['event_id'][0], data['event_id_count']) for data in track_data) + for event in self: + event.count_tracks = result.get(event.id, 0) + + @api.multi + @api.depends('track_ids.tag_ids') + def _get_tracks_tag_ids(self): + for event in self: + event.tracks_tag_ids = event.track_ids.mapped('tag_ids').ids + + @api.multi + def _count_sponsor(self): + for event in self: + event.count_sponsor = len(event.sponsor_ids) diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py index e7520a1b2e0..621b5b80d18 100644 --- a/addons/website_form/controllers/main.py +++ b/addons/website_form/controllers/main.py @@ -1,16 +1,20 @@ # -*- coding: utf-8 -*- -import base64 +# Part of Odoo. See LICENSE file for full copyright and licensing details. +import base64 import json import pytz + from datetime import datetime from psycopg2 import IntegrityError -from openerp import http, SUPERUSER_ID -from openerp.http import request -from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT -from openerp.tools.translate import _ -from openerp.exceptions import ValidationError -from openerp.addons.base.ir.ir_qweb.fields import nl2br + +from odoo import http +from odoo.http import request +from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT +from odoo.tools.translate import _ +from odoo.exceptions import ValidationError +from odoo.addons.base.ir.ir_qweb.fields import nl2br + class WebsiteForm(http.Controller): diff --git a/addons/website_form/models/models.py b/addons/website_form/models/models.py index 9a6799b6e5b..1f3ec5d374d 100644 --- a/addons/website_form/models/models.py +++ b/addons/website_form/models/models.py @@ -1,7 +1,9 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import itertools -from openerp import tools -from openerp import models, fields, api +from odoo import models, fields, api MAGIC_FIELDS = ["id", "create_uid", "create_date", "write_uid", "write_date", "__last_update"] diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index d9dd0a91041..6ff3d1404f9 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -1,19 +1,20 @@ # -*- coding: utf-8 -*- -from datetime import datetime +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import base64 +import json +import lxml import werkzeug.exceptions import werkzeug.urls import werkzeug.wrappers -import json -import lxml -from urllib2 import urlopen, URLError -import base64 -import openerp -from openerp import tools, _ -from openerp import http -from openerp.addons.web.controllers.main import binary_content -from openerp.http import request -from openerp.addons.website.models.website import slug +from datetime import datetime +from urllib2 import urlopen, URLError + +from odoo import http, modules, SUPERUSER_ID, tools, _ +from odoo.addons.web.controllers.main import binary_content +from odoo.addons.website.models.website import slug +from odoo.http import request class WebsiteForum(http.Controller): @@ -562,10 +563,10 @@ class WebsiteForum(http.Controller): @http.route(['/forum/user//avatar'], type='http', auth="public", website=True) def user_avatar(self, user_id=0, **post): - status, headers, content = binary_content(model='res.users', id=user_id, field='image_medium', default_mimetype='image/png', env=request.env(user=openerp.SUPERUSER_ID)) + status, headers, content = binary_content(model='res.users', id=user_id, field='image_medium', default_mimetype='image/png', env=request.env(user=SUPERUSER_ID)) if not content: - img_path = openerp.modules.get_module_resource('web', 'static/src/img', 'placeholder.png') + img_path = modules.get_module_resource('web', 'static/src/img', 'placeholder.png') with open(img_path, 'rb') as f: image = f.read() content = image.encode('base64') diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 3560197f17a..d12b7d77626 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -1,21 +1,17 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from datetime import datetime import itertools import logging import math import re import uuid + +from datetime import datetime from werkzeug.exceptions import Forbidden -from openerp import _ -from openerp import api, fields, models -from openerp import http -from openerp import modules -from openerp import tools -from openerp import SUPERUSER_ID -from openerp.addons.website.models.website import slug -from openerp.exceptions import UserError, ValidationError +from odoo import api, fields, models, modules, tools, SUPERUSER_ID, _ +from odoo.exceptions import UserError, ValidationError _logger = logging.getLogger(__name__) diff --git a/addons/website_forum/models/gamification.py b/addons/website_forum/models/gamification.py index 69ccd1ba769..73819aa97f5 100644 --- a/addons/website_forum/models/gamification.py +++ b/addons/website_forum/models/gamification.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import models, fields, api +from odoo import models, fields class Challenge(models.Model): @@ -8,6 +9,7 @@ class Challenge(models.Model): category = fields.Selection(selection_add=[('forum', 'Website / Forum')]) + class Badge(models.Model): _inherit = 'gamification.badge' diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py index cc51b80741e..78d0b7c8321 100644 --- a/addons/website_forum/models/res_users.py +++ b/addons/website_forum/models/res_users.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import hashlib from datetime import datetime -import hashlib from urllib import urlencode -from openerp import models, fields, api +from odoo import api, fields, models class Users(models.Model): diff --git a/addons/website_forum/tests/common.py b/addons/website_forum/tests/common.py index 279ebc608ee..f2f074aeff0 100644 --- a/addons/website_forum/tests/common.py +++ b/addons/website_forum/tests/common.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.tests import common +from odoo.tests import common KARMA = { 'ask': 5, 'ans': 10, diff --git a/addons/website_forum/tests/test_forum.py b/addons/website_forum/tests/test_forum.py index 7adf0141df5..344122abe2f 100644 --- a/addons/website_forum/tests/test_forum.py +++ b/addons/website_forum/tests/test_forum.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. from .common import KARMA, TestForumCommon from ..models.forum import KarmaError -from openerp.exceptions import UserError, AccessError -from openerp.tools import mute_logger +from odoo.exceptions import UserError, AccessError +from odoo.tools import mute_logger class TestForum(TestForumCommon): diff --git a/addons/website_forum/tests/test_forum_process.py b/addons/website_forum/tests/test_forum_process.py index 18f8812346e..ef8b290a075 100644 --- a/addons/website_forum/tests/test_forum_process.py +++ b/addons/website_forum/tests/test_forum_process.py @@ -1,8 +1,11 @@ -import openerp.tests +# Part of Odoo. See LICENSE file for full copyright and licensing details. -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestUi(openerp.tests.HttpCase): +import odoo.tests + + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestUi(odoo.tests.HttpCase): def test_01_admin_forum_tour(self): self.phantom_js("/", "odoo.__DEBUG__.services['web_tour.tour'].run('question')", "odoo.__DEBUG__.services['web_tour.tour'].tours.question", login="admin") diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index aecc5fc0502..761f954c6d6 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- -import base64 +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import SUPERUSER_ID -from openerp import http -from openerp.tools.translate import _ -from openerp.http import request +from odoo import http, _ +from odoo.addons.website.models.website import slug +from odoo.http import request -from openerp.addons.website.models.website import slug -class website_hr_recruitment(http.Controller): +class WebsiteHrRecruitment(http.Controller): @http.route([ '/jobs', '/jobs/country/', diff --git a/addons/website_hr_recruitment/tests/test_website_hr_recruitment.py b/addons/website_hr_recruitment/tests/test_website_hr_recruitment.py index 9cf70411ec3..a84aee1ebaa 100644 --- a/addons/website_hr_recruitment/tests/test_website_hr_recruitment.py +++ b/addons/website_hr_recruitment/tests/test_website_hr_recruitment.py @@ -1,8 +1,12 @@ -from openerp.api import Environment -import openerp.tests -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestWebsiteHrRecruitmentForm(openerp.tests.HttpCase): +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.api import Environment +import odoo.tests + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestWebsiteHrRecruitmentForm(odoo.tests.HttpCase): def test_tour(self): self.phantom_js("/", "odoo.__DEBUG__.services['web.Tour'].run('website_hr_recruitment_tour', 'test')", "odoo.__DEBUG__.services['web.Tour'].tours.website_hr_recruitment_tour") diff --git a/addons/website_links/controller/main.py b/addons/website_links/controller/main.py index 73786696f46..35eac514391 100644 --- a/addons/website_links/controller/main.py +++ b/addons/website_links/controller/main.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import werkzeug -from openerp import http -from openerp.http import request +from odoo import http +from odoo.http import request -class Website_Url(http.Controller): +class WebsiteUrl(http.Controller): @http.route('/website_links/new', type='json', auth='user', methods=['POST']) def create_shorten_url(self, **post): if 'url' not in post or post['url'] == '': diff --git a/addons/website_livechat/controllers/main.py b/addons/website_livechat/controllers/main.py index 0fa9ba265e9..753e4eef1ae 100644 --- a/addons/website_livechat/controllers/main.py +++ b/addons/website_livechat/controllers/main.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import http -from openerp.http import request +from odoo import http +from odoo.http import request class WebsiteLivechat(http.Controller): diff --git a/addons/website_livechat/models/im_livechat.py b/addons/website_livechat/models/im_livechat.py index 517cd0b544f..f73d3b594f7 100644 --- a/addons/website_livechat/models/im_livechat.py +++ b/addons/website_livechat/models/im_livechat.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -from openerp import api, models, fields -from openerp.addons.website.models.website import slug -from openerp.tools.translate import html_translate +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, models, fields +from odoo.addons.website.models.website import slug +from odoo.tools.translate import html_translate class ImLivechatChannel(models.Model): diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py index 2b557236b76..820457320b8 100644 --- a/addons/website_livechat/models/website.py +++ b/addons/website_livechat/models/website.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from openerp.osv import osv -from openerp import api, fields, models -from openerp.http import request +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + class Website(models.Model): diff --git a/addons/website_payment/controllers/main.py b/addons/website_payment/controllers/main.py index f4d6f78a1ba..fc3441f0b5f 100644 --- a/addons/website_payment/controllers/main.py +++ b/addons/website_payment/controllers/main.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -from openerp import http -from openerp.http import request -from openerp.tools.translate import _ +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import http, _ +from odoo.http import request -class website_payment(http.Controller): +class WebsitePayment(http.Controller): @http.route(['/my/payment_method'], type='http', auth="user", website=True) def payment_method(self): acquirers = list(request.env['payment.acquirer'].search([('website_published', '=', True), ('registration_view_template_id', '!=', False)])) diff --git a/addons/website_payment/models/res_config.py b/addons/website_payment/models/res_config.py index 172ee609294..062697abd4c 100644 --- a/addons/website_payment/models/res_config.py +++ b/addons/website_payment/models/res_config.py @@ -1,4 +1,7 @@ -from openerp import api, fields, models +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models class PaymentConfigSettings(models.TransientModel): diff --git a/addons/website_payment/models/website.py b/addons/website_payment/models/website.py index 9d3be858011..540277d79c2 100644 --- a/addons/website_payment/models/website.py +++ b/addons/website_payment/models/website.py @@ -1,4 +1,7 @@ -from openerp import api, models +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, models class Website(models.Model): diff --git a/addons/website_project/tests/test_access_rights.py b/addons/website_project/tests/test_access_rights.py index 8f6a551a98a..0e2fa71dee3 100644 --- a/addons/website_project/tests/test_access_rights.py +++ b/addons/website_project/tests/test_access_rights.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.project.tests.test_access_rights import TestPortalProjectBase +from odoo.addons.project.tests.test_access_rights import TestPortalProjectBase from odoo.exceptions import AccessError from odoo.tools import mute_logger diff --git a/addons/website_project_issue/controllers/main.py b/addons/website_project_issue/controllers/main.py index 6b74503cf46..8c066b420b1 100644 --- a/addons/website_project_issue/controllers/main.py +++ b/addons/website_project_issue/controllers/main.py @@ -3,14 +3,13 @@ from collections import OrderedDict -from openerp import http, _ -from openerp.addons.website_portal.controllers.main import website_account -from openerp.http import request +from odoo import http, _ +from odoo.addons.website_portal.controllers.main import website_account +from odoo.http import request class WebsiteAccount(website_account): - def _prepare_portal_layout_values(self): values = super(WebsiteAccount, self)._prepare_portal_layout_values() # domain is needed to hide non portal project for employee diff --git a/addons/website_project_issue/models/project_issue.py b/addons/website_project_issue/models/project_issue.py index a3dd4170826..8e7e0581bbe 100644 --- a/addons/website_project_issue/models/project_issue.py +++ b/addons/website_project_issue/models/project_issue.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import _, api, models +from odoo import api, models class Issue(models.Model): diff --git a/addons/website_project_issue/tests/test_access_rights.py b/addons/website_project_issue/tests/test_access_rights.py index defdd6ff55c..8039755106c 100644 --- a/addons/website_project_issue/tests/test_access_rights.py +++ b/addons/website_project_issue/tests/test_access_rights.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.project.tests.test_access_rights import TestPortalProjectBase -from openerp.exceptions import AccessError -from openerp.tools import mute_logger +from odoo.addons.project.tests.test_access_rights import TestPortalProjectBase +from odoo.exceptions import AccessError +from odoo.tools import mute_logger class TestPortalProjectBase(TestPortalProjectBase): diff --git a/addons/website_rating_project_issue/controllers/main.py b/addons/website_rating_project_issue/controllers/main.py index 4a066aa0c00..0494bb7efc0 100644 --- a/addons/website_rating_project_issue/controllers/main.py +++ b/addons/website_rating_project_issue/controllers/main.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- -from openerp import http -from openerp.http import request +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from werkzeug.exceptions import NotFound import datetime -from werkzeug.exceptions import NotFound + +from odoo import http +from odoo.http import request class WebsiteRatingProject(http.Controller): diff --git a/addons/website_rating_project_issue/models/project.py b/addons/website_rating_project_issue/models/project.py index 41d181b7cd0..ca0df1796b7 100644 --- a/addons/website_rating_project_issue/models/project.py +++ b/addons/website_rating_project_issue/models/project.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -from openerp import api, fields, models +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, models class Project(models.Model): diff --git a/addons/website_sale_options/tests/test_customize.py b/addons/website_sale_options/tests/test_customize.py index 61646311c7e..ff307855365 100644 --- a/addons/website_sale_options/tests/test_customize.py +++ b/addons/website_sale_options/tests/test_customize.py @@ -1,7 +1,10 @@ -import openerp.tests +# Part of Odoo. See LICENSE file for full copyright and licensing details. -@openerp.tests.common.at_install(False) -@openerp.tests.common.post_install(True) -class TestUi(openerp.tests.HttpCase): +import odoo.tests + + +@odoo.tests.common.at_install(False) +@odoo.tests.common.post_install(True) +class TestUi(odoo.tests.HttpCase): def test_01_admin_shop_customize_tour(self): self.phantom_js("/", "odoo.__DEBUG__.services['web.Tour'].run('shop_customize', 'test')", "odoo.__DEBUG__.services['web.Tour'].tours.shop_customize", login="admin") diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index f3a90f78a26..d1871d88ff3 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/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 logging import werkzeug -from openerp import http -from openerp.exceptions import AccessError, UserError -from openerp.http import request -from openerp.tools.translate import _ +from odoo import http, _ +from odoo.exceptions import AccessError, UserError +from odoo.http import request _logger = logging.getLogger(__name__) -class website_slides(http.Controller): +class WebsiteSlides(http.Controller): _slides_per_page = 12 _slides_per_list = 20 _order_by_criterion = { diff --git a/addons/website_slides/models/res_config.py b/addons/website_slides/models/res_config.py index 4436c5aeb33..68138e90e3f 100644 --- a/addons/website_slides/models/res_config.py +++ b/addons/website_slides/models/res_config.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 website_config_settings(models.TransientModel): diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index 543a7bffd68..2bb6a3848c1 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -1,19 +1,21 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from PIL import Image +from urllib import urlencode +from urlparse import urlparse import datetime import io import json -from PIL import Image import re -from urllib import urlencode import urllib2 -from urlparse import urlparse -from openerp import api, fields, models, SUPERUSER_ID, _ -from openerp.tools import image -from openerp.tools.translate import html_translate -from openerp.exceptions import Warning -from openerp.addons.website.models.website import slug +from odoo import api, fields, models, SUPERUSER_ID, _ +from odoo.tools import image +from odoo.tools.translate import html_translate +from odoo.exceptions import Warning +from odoo.addons.website.models.website import slug class Channel(models.Model): diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py index 599d14b2bf8..333a0a7495c 100644 --- a/addons/website_theme_install/models/ir_module_module.py +++ b/addons/website_theme_install/models/ir_module_module.py @@ -1,5 +1,10 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import os -from openerp import api, fields, models, _ + +from odoo import api, fields, models + class IrModuleModule(models.Model): _name = "ir.module.module"