[MERGE] rename openerp to odoo, and adapt imports

addons/base_import/tests/test_base_import.py

@@ -202,7 +202,7 @@ class TestPreview(TransactionCase):
         })
         return import_wizard
 
-    @mute_logger('openerp.addons.base_import.models.base_import')
+    @mute_logger('odoo.addons.base_import.models.base_import')
     def test_encoding(self):
         import_wizard = self.make_import()
         result = import_wizard.parse_preview({
@@ -211,7 +211,7 @@ class TestPreview(TransactionCase):
         })
         self.assertTrue('error' in result)
 
-    @mute_logger('openerp.addons.base_import.models.base_import')
+    @mute_logger('odoo.addons.base_import.models.base_import')
     def test_csv_errors(self):
         import_wizard = self.make_import()
 

addons/bus/models/bus_presence.py

@@ -49,7 +49,7 @@ class BusPresence(models.Model):
             if datetime.datetime.strptime(presence.last_presence, DEFAULT_SERVER_DATETIME_FORMAT) < last_presence:
                 values['last_presence'] = last_presence.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
             # Hide transaction serialization errors, which can be ignored, the presence update is not essential
-            with tools.mute_logger('openerp.sql_db'):
+            with tools.mute_logger('odoo.sql_db'):
                 presence.write(values)
         # avoid TransactionRollbackError
         self.env.cr.commit() # TODO : check if still necessary

addons/crm/wizard/base_partner_merge.py

@@ -177,7 +177,7 @@ class MergePartnerAutomatic(models.TransientModel):
                     self._cr.execute(query, (dst_partner.id, partner.id, dst_partner.id))
             else:
                 try:
-                    with mute_logger('openerp.sql_db'), self._cr.savepoint():
+                    with mute_logger('odoo.sql_db'), self._cr.savepoint():
                         query = 'UPDATE "%(table)s" SET %(column)s = %%s WHERE %(column)s IN %%s' % query_dic
                         self._cr.execute(query, (dst_partner.id, tuple(src_partners.ids),))
 
@@ -216,7 +216,7 @@ class MergePartnerAutomatic(models.TransientModel):
                 return
             records = Model.sudo().search([(field_model, '=', 'res.partner'), (field_id, '=', src.id)])
             try:
-                with mute_logger('openerp.sql_db'), self._cr.savepoint():
+                with mute_logger('odoo.sql_db'), self._cr.savepoint():
                     return records.sudo().write({field_id: dst_partner.id})
             except psycopg2.Error:
                 # updating fails, most likely due to a violated unique constraint

addons/event/tests/test_event_flow.py

@@ -12,7 +12,7 @@ from mock import patch
 
 class TestEventFlow(TestEventCommon):
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_00_basic_event_auto_confirm(self):
         """ Basic event management with auto confirmation """
         event_config = self.env['event.config.settings'].sudo(self.user_eventmanager).create({
@@ -67,7 +67,7 @@ class TestEventFlow(TestEventCommon):
             test_event.button_cancel()
 
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_10_advanced_event_flow(self):
         """ Avanced event flow: no auto confirmation, manage minimum / maximum
         seats, ... """

addons/event/tests/test_mail_schedule.py

@@ -10,7 +10,7 @@ from odoo.tools import mute_logger
 
 class TestMailSchedule(TestEventCommon):
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_00_event_mail_schedule(self):
         """ Test mail scheduling for events """
         self.env['ir.values'].set_default('event.config.settings', 'auto_confirmation', True)

addons/hr_holidays/tests/test_holidays_flow.py

@@ -11,7 +11,7 @@ from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
 
 class TestHolidaysFlow(TestHrHolidaysBase):
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_00_leave_request_flow(self):
         """ Testing leave request flow """
         Holidays = self.env['hr.holidays']

addons/mail/tests/test_invite.py

@@ -7,7 +7,7 @@ from odoo.tools import mute_logger
 
 class TestInvite(TestMail):
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_invite_email(self):
         mail_invite = self.env['mail.wizard.invite'].with_context({
             'default_res_model': 'mail.channel',

addons/mail/tests/test_mail_channel.py

@@ -34,7 +34,7 @@ class TestMailGroup(TestMail):
         cls.env['mail.channel']._patch_method('message_get_recipient_values', mail_group_message_get_recipient_values)
         super(TestMail, cls).tearDownClass()
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_access_rights_public(self):
         # Read public group -> ok
         self.group_public.sudo(self.user_public).read()
@@ -62,7 +62,7 @@ class TestMailGroup(TestMail):
         with self.assertRaises(AccessError):
             self.group_public.sudo(self.user_public).unlink()
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_access_rights_groups(self):
         # Employee read employee-based group: ok
         # TODO Change the except_orm to Warning

addons/mail/tests/test_mail_features.py

@@ -12,7 +12,7 @@ class TestMailFeatures(TestMail):
         alias = self.env['mail.alias'].with_context(alias_model_name='mail.channel').create({'alias_name': 'b4r+_#_R3wl$$'})
         self.assertEqual(alias.alias_name, 'b4r+_-_r3wl-', 'Disallowed chars should be replaced by hyphens')
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_needaction(self):
         na_emp1_base = self.env['mail.message'].sudo(self.user_employee)._needaction_count(domain=[])
         na_emp2_base = self.env['mail.message'].sudo()._needaction_count(domain=[])
@@ -27,7 +27,7 @@ class TestMailFeatures(TestMail):
 
 class TestMessagePost(TestMail):
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_no_subscribe_author(self):
         original = self.group_pigs.message_follower_ids
         self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True}).message_post(
@@ -37,7 +37,7 @@ class TestMessagePost(TestMail):
 
     # TODO : the author of a message post on mail.channel should not be added as follower
 
-    # @mute_logger('openerp.addons.mail.models.mail_mail')
+    # @mute_logger('odoo.addons.mail.models.mail_mail')
     # def test_post_subscribe_author(self):
     #     original = self.group_pigs.message_follower_ids
     #     self.group_pigs.sudo(self.user_employee).message_post(
@@ -45,7 +45,7 @@ class TestMessagePost(TestMail):
     #     self.assertEqual(self.group_pigs.message_follower_ids.mapped('partner_id'), original.mapped('partner_id') | self.user_employee.partner_id)
     #     self.assertEqual(self.group_pigs.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_no_subscribe_recipients(self):
         original = self.group_pigs.message_follower_ids
         self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True}).message_post(
@@ -53,7 +53,7 @@ class TestMessagePost(TestMail):
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('partner_id'), original.mapped('partner_id'))
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_subscribe_recipients(self):
         original = self.group_pigs.message_follower_ids
         self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True}).message_post(
@@ -61,7 +61,7 @@ class TestMessagePost(TestMail):
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('partner_id'), original.mapped('partner_id') | self.partner_1 | self.partner_2)
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_subscribe_recipients_partial(self):
         original = self.group_pigs.message_follower_ids
         self.group_pigs.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True, 'mail_post_autofollow_partner_ids': [self.partner_2.id]}).message_post(
@@ -69,7 +69,7 @@ class TestMessagePost(TestMail):
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('partner_id'), original.mapped('partner_id') | self.partner_2)
         self.assertEqual(self.group_pigs.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_notifications(self):
         _body, _body_alt = '<p>Test Body</p>', 'Test Body'
         _subject = 'Test Subject'
@@ -139,7 +139,7 @@ class TestMessagePost(TestMail):
         self.assertTrue(all(_body_alt in m['body'] for m in self._mails))
         self.assertFalse(any(m['references'] for m in self._mails))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_post_answer(self):
         _body = '<p>Test Body</p>'
         _subject = 'Test Subject'
@@ -171,7 +171,7 @@ class TestMessagePost(TestMail):
         self.assertEqual(new_msg.parent_id.id, parent_msg.id, 'message_post: flatten error')
         self.assertFalse(new_msg.partner_ids)
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_message_compose(self):
         composer = self.env['mail.compose.message'].with_context({
             'default_composition_mode': 'comment',
@@ -202,7 +202,7 @@ class TestMessagePost(TestMail):
 
         # TODO: test attachments ?
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_message_compose_mass_mail(self):
         composer = self.env['mail.compose.message'].with_context({
             'default_composition_mode': 'mass_mail',
@@ -256,7 +256,7 @@ class TestMessagePost(TestMail):
         # self.assertEqual(set(group_bird.message_follower_ids.ids), set([self.partner_admin_id]),
         #                 'compose wizard: mail_post_autofollow and mail_create_nosubscribe context keys not correctly taken into account')
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_message_compose_mass_mail_active_domain(self):
         self.env['mail.compose.message'].with_context({
             'default_composition_mode': 'mass_mail',

addons/mail/tests/test_mail_gateway.py

@@ -316,7 +316,7 @@ class TestMailgateway(TestMail):
             'message_id': '<123456-openerp-%s-mail.channel@%s>' % (self.group_public.id, socket.gethostname()),
         })
 
-    @mute_logger('openerp.addons.mail.models.mail_thread')
+    @mute_logger('odoo.addons.mail.models.mail_thread')
     def test_message_parse(self):
         """ Test parsing of various scenarios of incoming emails """
         res = self.env['mail.thread'].message_parse(MAIL_TEMPLATE_PLAINTEXT)
@@ -348,14 +348,14 @@ class TestMailgateway(TestMail):
                       res.get('body', ''),
                       'message_parse: second part of the html version should be in body after parsing multipart/mixed')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread')
+    @mute_logger('odoo.addons.mail.models.mail_thread')
     def test_message_process_cid(self):
         new_groups = self.format_and_process(MAIL_MULTIPART_IMAGE, subject='My Frogs', to='groups@example.com')
         message = new_groups.message_ids[0]
         for attachment in message.attachment_ids:
             self.assertIn('/web/image/%s' % attachment.id, message.body)
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_alias_basic(self):
         """ Incoming email on an alias creating a new record + message_new + message details """
         new_groups = self.format_and_process(MAIL_TEMPLATE, subject='My Frogs', to='groups@example.com, other@gmail.com')
@@ -383,7 +383,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self._mails), 0,
                          'message_process: should create emails without any follower added')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_alias_user_id(self):
         """ Test alias ownership """
         self.alias.write({'alias_user_id': self.user_employee.id})
@@ -395,7 +395,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(res[0], self.user_employee.id,
                          'message_process: group should have been created by alias_user_id')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_email_email_from(self):
         """ Incoming email: not recognized author: email_from, no author_id, no followers """
         new_groups = self.format_and_process(MAIL_TEMPLATE, to='groups@example.com, other@gmail.com')
@@ -408,7 +408,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(new_groups.message_partner_ids), 0,
                          'message_process: newly create group should not have any follower')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_email_author(self):
         """ Incoming email: recognized author: email_from, author_id, added as follower """
         new_groups = self.format_and_process(MAIL_TEMPLATE, email_from='Valid Lelitre <valid.lelitre@agrolait.com>', to='groups@example.com, valid.other@gmail.com')
@@ -426,7 +426,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self._mails), 0,
                          'message_process: no bounce or notificatoin email should be sent with follower = author')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
     def test_message_process_alias_partners_bounce(self):
         """ Incoming email from an unknown partner on a Partners only alias -> bounce """
         self.alias.write({'alias_contact': 'partners'})
@@ -441,7 +441,7 @@ class TestMailgateway(TestMail):
         self.assertIn('whatever-2a840@postmaster.twitter.com', self._mails[0].get('email_to'),
                       'message_process: bounce email on Partners alias should go to Return-Path address')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
     def test_message_process_alias_followers_bounce(self):
         """ Incoming email from unknown partner / not follower partner on a Followers only alias -> bounce """
         self.alias.write({
@@ -462,7 +462,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self._mails), 1,
                          'message_process: incoming email on Followers alias should send a bounce email')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_alias_partner(self):
         """ Incoming email from a known partner on a Partners alias -> ok (+ test on alias.user_id) """
         self.alias.write({'alias_contact': 'partners'})
@@ -475,7 +475,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(new_groups.message_ids), 1,
                          'message_process: newly created group should have the incoming email in message_ids')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_alias_followers(self):
         """ Incoming email from a parent document follower on a Followers only alias -> ok """
         self.alias.write({
@@ -488,7 +488,7 @@ class TestMailgateway(TestMail):
         # Test: one group created by Raoul (or Sylvie maybe, if we implement it)
         self.assertEqual(len(new_groups), 1, 'message_process: a new mail.channel should have been created')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
     def test_message_process_alias_update(self):
         """ Incoming email update discussion + notification email """
         self.alias.write({'alias_force_thread_id': self.group_public.id})
@@ -518,7 +518,7 @@ class TestMailgateway(TestMail):
         # self.assertEqual(self.group_public.message_channel_ids, self.env['mail.channel'],
         #                  'message_process: after reply, group should have 2 followers (0 channels)')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_in_reply_to(self):
         """ Incoming email using in-rely-to should go into the right destination even with a wrong destination """
         self.format_and_process(
@@ -530,7 +530,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain one new message')
         self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_references(self):
         """ Incoming email using references should go into the right destination even with a wrong destination """
         self.format_and_process(
@@ -541,7 +541,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain one new message')
         self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_references_forward(self):
         """ Incoming email using references but with alias forward should not go into references destination """
         res_test = self.format_and_process(
@@ -556,7 +556,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(res_test.name, 'My Dear Forward')
         self.assertEqual(len(res_test.message_ids), 1)
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_references_forward_cc(self):
         """ Incoming email using references but with alias forward should not go into references destination """
         self.format_and_process(
@@ -569,7 +569,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain one new message')
         self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_model_res_id(self):
         """ Incoming email with ref holding model / res_id but that does not match any message in the thread: must raise since OpenERP saas-3 """
         self.assertRaises(ValueError,
@@ -600,7 +600,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(self.group_public.message_ids), 2, 'message_process: group should contain 6 messages')
         self.assertEqual(len(self.group_public.message_ids[0].child_ids), 0, 'message_process: msg1 should not have children')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_duplicate(self):
         """ Duplicate emails (same message_id) are not processed """
         self.alias.write({'alias_force_thread_id': self.group_public.id,})
@@ -627,7 +627,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(no_of_msg, 1,
                          'message_process: message with already existing message_id should not have been duplicated')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_partner_find(self):
         """ Finding the partner based on email, based on partner / user / follower """
         from_1 = self.env['res.partner'].create({'name': 'A', 'email': 'from.test@example.com'})
@@ -648,7 +648,7 @@ class TestMailgateway(TestMail):
         self.format_and_process(MAIL_TEMPLATE, to='public@example.com', msg_id='<3>', email_from='Brice Denisse <from.test@example.com>')
         self.assertEqual(self.group_public.message_ids[0].author_id, from_3, 'message_process: email_from -> author_id wrong')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_crash_wrong_model(self):
         """ Incoming email with model that does not accepts incoming emails must raise """
         self.assertRaises(ValueError,
@@ -657,7 +657,7 @@ class TestMailgateway(TestMail):
                           to='noone@example.com', subject='spam', extra='', model='res.country',
                           msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_crash_no_data(self):
         """ Incoming email without model and without alias must raise """
         self.assertRaises(ValueError,
@@ -666,7 +666,7 @@ class TestMailgateway(TestMail):
                           to='noone@example.com', subject='spam', extra='',
                           msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_fallback(self):
         """ Incoming email with model that accepting incoming emails as fallback """
         frog_groups = self.format_and_process(
@@ -675,7 +675,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(len(frog_groups), 1,
                          'message_process: erroneous email but with a fallback model should have created a new mail.channel')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
     def test_message_process_plain_text(self):
         """ Incoming email in plaintext should be stored as html """
         frog_groups = self.format_and_process(
@@ -687,7 +687,7 @@ class TestMailgateway(TestMail):
         self.assertIn('<pre>\nPlease call me as soon as possible this afternoon!\n<span data-o-mail-quote="1">\n--\nSylvie\n</span></pre>', msg.body,
                       'message_process: plaintext incoming email incorrectly parsed')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
     def test_private_discussion(self):
         """ Testing private discussion between partners. """
         msg1_pids = [self.env.user.partner_id.id, self.partner_1.id]
@@ -729,7 +729,7 @@ class TestMailgateway(TestMail):
         self.assertEqual(msg.needaction_partner_ids, self.user_employee.partner_id | self.env.user.partner_id,
                          'message_post: private discussion: incorrect notified recipients when replying')
 
-    @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
     def test_forward_parent_id(self):
         msg = self.group_pigs.sudo(self.user_employee).message_post(no_auto_thread=True, subtype='mail.mt_comment')
         self.assertNotIn(msg.model, msg.message_id)

addons/mail/tests/test_mail_message.py

@@ -111,7 +111,7 @@ class TestMailMessage(TestMail):
         self.assertNotIn('mail.channel', msg.message_id)
         self.assertNotIn('-%d-' % self.group_pigs.id, msg.message_id)
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_mail_message_access_search(self):
         # Data: various author_ids, partner_ids, documents
         msg1 = self.env['mail.message'].create({
@@ -164,7 +164,7 @@ class TestMailMessage(TestMail):
         messages = self.env['mail.message'].sudo(self.user_portal).search([('subject', 'like', '_Test')])
         self.assertEqual(messages, msg4 | msg5)
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_mail_message_access_read_crash(self):
         # TODO: Change the except_orm to Warning ( Because here it's call check_access_rule
         # which still generate exception in except_orm.So we need to change all
@@ -172,7 +172,7 @@ class TestMailMessage(TestMail):
         with self.assertRaises(except_orm):
             self.message.sudo(self.user_employee).read()
 
-    @mute_logger('openerp.models')
+    @mute_logger('odoo.models')
     def test_mail_message_access_read_crash_portal(self):
         with self.assertRaises(except_orm):
             self.message.sudo(self.user_portal).read(['body', 'message_type', 'subtype_id'])
@@ -202,7 +202,7 @@ class TestMailMessage(TestMail):
         # Test: Bert reads the message, ok because linked to a doc he is allowed to read
         self.message.sudo(self.user_employee).read()
 
-    @mute_logger('openerp.addons.base.ir.ir_model')
+    @mute_logger('odoo.addons.base.ir.ir_model')
     def test_mail_message_access_create_crash_public(self):
         # Do: Bert creates a message on Pigs -> ko, no creation rights
         with self.assertRaises(AccessError):
@@ -212,13 +212,13 @@ class TestMailMessage(TestMail):
         with self.assertRaises(AccessError):
             self.env['mail.message'].sudo(self.user_public).create({'model': 'mail.channel', 'res_id': self.group_public.id, 'body': 'Test'})
 
-    @mute_logger('openerp.models')
+    @mute_logger('odoo.models')
     def test_mail_message_access_create_crash(self):
         # Do: Bert create a private message -> ko, no creation rights
         with self.assertRaises(except_orm):
             self.env['mail.message'].sudo(self.user_employee).create({'model': 'mail.channel', 'res_id': self.group_private.id, 'body': 'Test'})
 
-    @mute_logger('openerp.models')
+    @mute_logger('odoo.models')
     def test_mail_message_access_create_doc(self):
         # TODO Change the except_orm to Warning
         Message = self.env['mail.message'].sudo(self.user_employee)

addons/mail/tests/test_mail_template.py

@@ -67,7 +67,7 @@ class TestMailTemplate(TestMail):
         self.assertEqual(set(attachments.mapped('res_model')), set(['res.partner']))
         self.assertEqual(set(attachments.mapped('res_id')), set([self.user_admin.partner_id.id]))
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_composer_template_send(self):
         self.group_pigs.with_context(use_template=False).message_post_with_template(self.email_template.id, composition_mode='comment')
 
@@ -81,7 +81,7 @@ class TestMailTemplate(TestMail):
         # self.assertIn((attach.datas_fname, base64.b64decode(attach.datas)), _attachments_test,
         #     'mail.message attachment name / data incorrect')
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_composer_template_mass_mailing(self):
         composer = self.env['mail.compose.message'].with_context({
             'default_composition_mode': 'mass_mail',

addons/mail/tests/test_message_read.py

@@ -7,7 +7,7 @@ from odoo.tools import mute_logger
 
 class TestMessageRead(TestMail):
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def setUp(self):
         super(TestMessageRead, self).setUp()
         self.user_employee.write({'notify_email': 'none'})

addons/payment_buckaroo/tests/test_buckaroo.py

@@ -98,7 +98,7 @@ class BuckarooForm(BuckarooCommon):
                 'Buckaroo: wrong value for form input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
             )
 
-    @mute_logger('openerp.addons.payment_buckaroo.models.payment', 'ValidationError')
+    @mute_logger('odoo.addons.payment_buckaroo.models.payment', 'ValidationError')
     def test_20_buckaroo_form_management(self):
         # be sure not to do stupid thing
         self.assertEqual(self.buckaroo.environment, 'test', 'test without test environment')

addons/payment_ogone/tests/test_ogone.py

@@ -94,7 +94,7 @@ class OgonePayment(PaymentAcquirerCommon):
                 'ogone: wrong value for form input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
             )
 
-    @mute_logger('openerp.addons.payment_ogone.models.payment', 'ValidationError')
+    @mute_logger('odoo.addons.payment_ogone.models.payment', 'ValidationError')
     def test_20_ogone_form_management(self):
         # be sure not to do stupid thing
         self.assertEqual(self.ogone.environment, 'test', 'test without test environment')

addons/payment_paypal/tests/test_paypal.py

@@ -105,7 +105,7 @@ class PaypalForm(PaypalCommon):
                 self.assertEqual(form_input.get('value'), '1.57', 'paypal: wrong computed fees')
         self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form')
 
-    @mute_logger('openerp.addons.payment_paypal.models.payment', 'ValidationError')
+    @mute_logger('odoo.addons.payment_paypal.models.payment', 'ValidationError')
     def test_20_paypal_form_management(self):
         # be sure not to do stupid things
         self.assertEqual(self.paypal.environment, 'test', 'test without test environment')

addons/payment_stripe/tests/test_stripe.py

@@ -166,7 +166,7 @@ class StripeTest(StripeCommon):
         # simulate an error
         stripe_post_data['status'] = 'error'
         stripe_post_data.update({u'error': {u'message': u"Your card's expiration year is invalid.", u'code': u'invalid_expiry_year', u'type': u'card_error', u'param': u'exp_year'}})
-        with mute_logger('openerp.addons.payment_stripe.models.payment'):
+        with mute_logger('odoo.addons.payment_stripe.models.payment'):
             tx.form_feedback(stripe_post_data, 'stripe')
         # check state
         self.assertEqual(tx.state, 'error', 'Stipe: erroneous validation did not put tx into error state')

addons/portal/tests/test_portal.py

@@ -33,7 +33,7 @@ class TestPortal(TestMail):
             'body': 'Body text'})
         compose.send_mail()
 
-    @mute_logger('openerp.addons.mail.models.mail_mail')
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_invite_email_portal(self):
         group_pigs = self.group_pigs
         base_url = self.env['ir.config_parameter'].get_param('web.base.url', default='')

addons/procurement/wizard/procurement_order_compute_all.py

@@ -22,7 +22,7 @@ class ProcurementComputeAll(models.TransientModel):
             scheduler_cron = self.sudo().env.ref('procurement.ir_cron_scheduler_action')
             # Avoid to run the scheduler multiple times in the same time
             try:
-                with tools.mute_logger('openerp.sql_db'):
+                with tools.mute_logger('odoo.sql_db'):
                     self._cr.execute("SELECT id FROM ir_cron WHERE id = %s FOR UPDATE NOWAIT", (scheduler_cron.id,))
             except Exception:
                 _logger.info('Attempt to run procurement scheduler aborted, as already running')

addons/product/models/product_template.py

@@ -404,7 +404,7 @@ class ProductTemplate(models.Model):
             # unlink or inactive product
             for variant in variants_to_activate:
                 try:
-                    with self._cr.savepoint(), tools.mute_logger('openerp.sql_db'):
+                    with self._cr.savepoint(), tools.mute_logger('odoo.sql_db'):
                         variant.unlink()
                 # We catch all kind of exception to be sure that the operation doesn't fail.
                 except (psycopg2.Error, except_orm):

addons/project/tests/test_access_rights.py

@@ -30,7 +30,7 @@ class TestPortalProjectBase(TestProjectBase):
 
 class TestPortalProject(TestPortalProjectBase):
 
-    @mute_logger('openerp.addons.base.ir.ir_model')
+    @mute_logger('odoo.addons.base.ir.ir_model')
     def test_employee_project_access_rights(self):
         pigs = self.project_pigs
 
@@ -52,7 +52,7 @@ class TestPortalProject(TestPortalProjectBase):
             'project_id': pigs.id})
         tmp_task.sudo(self.user_projectuser).unlink()
 
-    @mute_logger('openerp.addons.base.ir.ir_model')
+    @mute_logger('odoo.addons.base.ir.ir_model')
     def test_followers_project_access_rights(self):
         pigs = self.project_pigs
         pigs.write({'privacy_visibility': 'followers'})

addons/project/tests/test_project_flow.py

@@ -38,7 +38,7 @@ class TestProjectFlow(TestProjectBase):
         dogs = pigs.copy()
         self.assertEqual(len(dogs.tasks), 2, 'project: duplicating a project must duplicate its tasks')
 
-    @mute_logger('openerp.addons.mail.mail_thread')
+    @mute_logger('odoo.addons.mail.mail_thread')
     def test_task_process_without_stage(self):
         # Do: incoming mail from an unknown partner on an alias creates a new task 'Frogs'
         task = self.format_and_process(
@@ -65,7 +65,7 @@ class TestProjectFlow(TestProjectBase):
         self.assertEqual(task.project_id.id, self.project_pigs.id, 'project_task: incorrect project')
         self.assertEqual(task.stage_id.sequence, False, "project_task: shouldn't have a stage, i.e. sequence=False")
 
-    @mute_logger('openerp.addons.mail.mail_thread')
+    @mute_logger('odoo.addons.mail.mail_thread')
     def test_task_process_with_stages(self):
         # Do: incoming mail from an unknown partner on an alias creates a new task 'Cats'
         task = self.format_and_process(

addons/sale/tests/test_sale_to_invoice.py

@@ -8,7 +8,7 @@ from odoo.tools import mute_logger
 
 
 class TestSale(TestMail):
-    @mute_logger('odoo.addons.base.ir.ir_model', 'openerp.osv.orm')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.osv.orm')
     def setUp(self):
         super(TestSale, self).setUp()
 

addons/stock/tests/test_stock_flow.py

@@ -6,7 +6,7 @@ from odoo.tools import mute_logger, float_round
 
 class TestStockFlow(TestStockCommon):
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_00_picking_create_and_transfer_quantity(self):
         """ Basic stock operation on incoming and outgoing shipment. """
         LotObj = self.env['stock.production.lot']

addons/website_forum/tests/test_forum.py

@@ -9,7 +9,7 @@ from odoo.tools import mute_logger
 
 class TestForum(TestForumCommon):
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_ask(self):
         Post = self.env['forum.post']
 
@@ -45,7 +45,7 @@ class TestForum(TestForumCommon):
         })
         self.assertEqual(self.user_portal.karma, KARMA['post'] + KARMA['gen_que_new'], 'website_forum: wrong karma generation when asking question')
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_answer(self):
         Post = self.env['forum.post']
 
@@ -66,7 +66,7 @@ class TestForum(TestForumCommon):
         })
         self.assertEqual(self.user_employee.karma, KARMA['ans'], 'website_forum: wrong karma generation when answering question')
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_vote_crash(self):
         Post = self.env['forum.post']
         self.user_employee.karma = KARMA['ans']
@@ -89,7 +89,7 @@ class TestForum(TestForumCommon):
         self.post.sudo(self.user_portal).vote(upvote=True)
         self.assertEqual(self.post.create_uid.karma, KARMA['ask'] + KARMA['gen_que_upv'], 'website_forum: wrong karma generation of upvoted question author')
 
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_downvote_crash(self):
         Post = self.env['forum.post']
         self.user_employee.karma = KARMA['ans']

addons/website_project/tests/test_access_rights.py

@@ -7,7 +7,7 @@ from odoo.tools import mute_logger
 
 
 class TestPortalProject(TestPortalProjectBase):
-    @mute_logger('openerp.addons.base.ir.ir_model')
+    @mute_logger('odoo.addons.base.ir.ir_model')
     def test_portal_project_access_rights(self):
         pigs = self.project_pigs
         pigs.write({'privacy_visibility': 'portal'})

addons/website_project_issue/tests/test_access_rights.py

@@ -27,7 +27,7 @@ class TestPortalProjectBase(TestPortalProjectBase):
 
 
 class TestPortalIssue(TestPortalProjectBase):
-    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.models')
+    @mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
     def test_00_project_access_rights(self):
         """ Test basic project access rights, for project and portal_project """
         pigs_id = self.project_pigs.id

odoo.py

@@ -48,7 +48,7 @@ def git_locate():
     while path != os.path.abspath(os.sep):
         gitconfig_path = os.path.join(path, '.git/config')
         if os.path.isfile(gitconfig_path):
-            release_py = os.path.join(path, 'openerp/release.py')
+            release_py = os.path.join(path, 'odoo/release.py')
             if os.path.isfile(release_py):
                 break
         path = os.path.dirname(path)
@@ -153,8 +153,8 @@ def main():
     elif len(sys.argv) == 2 and sys.argv[1] in cmds:
         cmds[sys.argv[1]]()
     else:
-        import openerp
-        openerp.cli.main()
+        import odoo
+        odoo.cli.main()
 
 if __name__ == "__main__":
     main()

odoo/__init__.py

@@ -25,7 +25,7 @@ multi_process = False
 # Make sure the OpenERP server runs in UTC. This is especially necessary
 # under Windows as under Linux it seems the real import of time is
 # sufficiently deferred so that setting the TZ environment variable
-# in openerp.cli.server was working.
+# in odoo.cli.server was working.
 import os
 os.environ['TZ'] = 'UTC' # Set the timezone...
 import time              # ... *then* import time.
@@ -71,7 +71,7 @@ import workflow
 from . import models
 from . import fields
 from . import api
-from openerp.tools.translate import _
+from odoo.tools.translate import _
 
 #----------------------------------------------------------
 # Other imports, which may require stuff from above

odoo/addons/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+""" Addons module.
+
+This module serves to contain all Odoo addons, across all configured addons
+paths. For the code to manage those addons, see odoo.modules.
+
+Addons are made available under `odoo.addons` after
+odoo.tools.config.parse_config() is called (so that the addons paths are
+known).
+
+This module also conveniently reexports some symbols from odoo.modules.
+Importing them from here is deprecated.
+
+"""

odoo/addons/base/__init__.py

@@ -10,8 +10,8 @@ import tests
 
 def post_init(cr, registry):
     """Rewrite ICP's to force groups"""
-    from openerp import api, SUPERUSER_ID
-    from openerp.addons.base.ir.ir_config_parameter import _default_parameters
+    from odoo import api, SUPERUSER_ID
+    from odoo.addons.base.ir.ir_config_parameter import _default_parameters
 
     env = api.Environment(cr, SUPERUSER_ID, {})
     ICP = env['ir.config_parameter']