diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index aacd6aa29c2..586fec3237c 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -22,17 +22,16 @@
import logging
import os
import re
-import time
-import tools
-
-import netsvc
-from osv import fields,osv
-from report.report_sxw import report_sxw, report_rml
-from tools.config import config
-from tools.safe_eval import safe_eval as eval
-from tools.translate import _
from socket import gethostname
+import time
+
from openerp import SUPERUSER_ID
+from openerp import netsvc, tools
+from openerp.osv import fields, osv
+from openerp.report.report_sxw import report_sxw, report_rml
+from openerp.tools.config import config
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index c80e1cf8a6e..c97f7371ea8 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -21,9 +21,9 @@
import itertools
-from osv import fields,osv
-from osv.orm import except_orm
-import tools
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.osv.orm import except_orm
class ir_attachment(osv.osv):
def check(self, cr, uid, ids, mode, context=None, values=None):
diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index 3c88a3fbc31..50af5732001 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -22,11 +22,12 @@
Store database-specific configuration parameters
"""
-from osv import osv,fields
import uuid
import datetime
-from tools import misc, config
+
from openerp import SUPERUSER_ID
+from openerp.osv import osv, fields
+from openerp.tools import misc, config
"""
A dictionary holding some configuration parameters to be initialized when the database is created.
diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index 243f4c772ea..cd0736856ce 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -27,15 +27,13 @@ import psycopg2
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import netsvc
import openerp
-import pooler
-import tools
+from openerp import netsvc, pooler, tools
from openerp.cron import WAKE_UP_NOW
-from osv import fields, osv
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from tools.safe_eval import safe_eval as eval
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/ir/ir_default.py b/openerp/addons/base/ir/ir_default.py
index 2378551153d..21c66c0972b 100644
--- a/openerp/addons/base/ir/ir_default.py
+++ b/openerp/addons/base/ir/ir_default.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields, osv
class ir_default(osv.osv):
_name = 'ir.default'
diff --git a/openerp/addons/base/ir/ir_exports.py b/openerp/addons/base/ir/ir_exports.py
index a53f63383da..972a21c9047 100644
--- a/openerp/addons/base/ir/ir_exports.py
+++ b/openerp/addons/base/ir/ir_exports.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class ir_exports(osv.osv):
diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py
index 7c03341b55f..aa7cb25d9f8 100644
--- a/openerp/addons/base/ir/ir_filters.py
+++ b/openerp/addons/base/ir/ir_filters.py
@@ -20,8 +20,8 @@
##############################################################################
from openerp import exceptions
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class ir_filters(osv.osv):
'''
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 1f5c14209a9..6af4d765145 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -31,8 +31,7 @@ import re
import smtplib
import threading
-from osv import osv
-from osv import fields
+from openerp.osv import osv, fields
from openerp.tools.translate import _
from openerp.tools import html2text
import openerp.tools as tools
diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index db133ad9904..927718ae177 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class ir_needaction_mixin(osv.AbstractModel):
'''Mixin class for objects using the need action feature.
diff --git a/openerp/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py
index a4341436158..53cd86fdc01 100644
--- a/openerp/addons/base/ir/ir_rule.py
+++ b/openerp/addons/base/ir/ir_rule.py
@@ -19,14 +19,15 @@
#
##############################################################################
-from osv import fields, osv, expression
import time
from operator import itemgetter
from functools import partial
-import tools
-from tools.safe_eval import safe_eval as eval
-from tools.misc import unquote as unquote
+
from openerp import SUPERUSER_ID
+from openerp import tools
+from openerp.osv import fields, osv, expression
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.misc import unquote as unquote
class ir_rule(osv.osv):
_name = 'ir.rule'
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index f6f9e58ca90..273d131c7f9 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -22,10 +22,9 @@
import logging
import time
-from osv import osv, fields
-from tools.translate import _
-
import openerp
+from openerp.osv import osv
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index f3985045fb2..42b61e594bd 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -19,12 +19,12 @@
#
##############################################################################
-import tools
import logging
+from openerp import tools
import openerp.modules
from openerp.osv import fields, osv
-from tools.translate import _
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index a8475d33552..9920d07b046 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -23,11 +23,11 @@
import base64
import re
import threading
-from tools.safe_eval import safe_eval as eval
-import tools
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp import tools
import openerp.modules
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
from openerp import SUPERUSER_ID
def one_in(setA, setB):
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 2f2a610877d..1e48c08f4e6 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -19,14 +19,15 @@
#
##############################################################################
-from osv import fields,osv
-from lxml import etree
-from tools import graph
-from tools.safe_eval import safe_eval as eval
-import tools
-from tools.view_validation import valid_view
-import os
import logging
+from lxml import etree
+import os
+
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.tools import graph
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.view_validation import valid_view
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 7af11789225..1487ec5837d 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -19,10 +19,11 @@
#
##############################################################################
-from osv import osv,fields
-from osv.orm import except_orm
import pickle
-from tools.translate import _
+
+from openerp.osv import osv, fields
+from openerp.osv.orm import except_orm
+from openerp.tools.translate import _
EXCLUDED_FIELDS = set((
'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
diff --git a/openerp/addons/base/ir/wizard/wizard_menu.py b/openerp/addons/base/ir/wizard/wizard_menu.py
index 17f0fc13f1d..a374b3dad2d 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu.py
+++ b/openerp/addons/base/ir/wizard/wizard_menu.py
@@ -18,7 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields,osv
+
+from openerp.osv import fields, osv
class wizard_model_menu(osv.osv_memory):
_name = 'wizard.ir.model.menu.create'
diff --git a/openerp/addons/base/ir/workflow/print_instance.py b/openerp/addons/base/ir/workflow/print_instance.py
index c14e01b7a19..17bf66d176c 100644
--- a/openerp/addons/base/ir/workflow/print_instance.py
+++ b/openerp/addons/base/ir/workflow/print_instance.py
@@ -20,11 +20,11 @@
##############################################################################
import logging
-import time, os
-
-import netsvc
-import report,pooler,tools
+import time
from operator import itemgetter
+import os
+
+from openerp import netsvc, pooler, report, tools
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/module/report/ir_module_reference_print.py b/openerp/addons/base/module/report/ir_module_reference_print.py
index 36978e21643..bb95dd7b2b8 100644
--- a/openerp/addons/base/module/report/ir_module_reference_print.py
+++ b/openerp/addons/base/module/report/ir_module_reference_print.py
@@ -20,7 +20,8 @@
##############################################################################
import time
-from report import report_sxw
+
+from openerp.report import report_sxw
class ir_module_reference_print(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/openerp/addons/base/module/wizard/base_export_language.py b/openerp/addons/base/module/wizard/base_export_language.py
index 882831af646..eb9004b9abe 100644
--- a/openerp/addons/base/module/wizard/base_export_language.py
+++ b/openerp/addons/base/module/wizard/base_export_language.py
@@ -19,12 +19,13 @@
#
##############################################################################
-import tools
import base64
import cStringIO
-from osv import fields,osv
-from tools.translate import _
-from tools.misc import get_iso_codes
+
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
+from openerp.tools.misc import get_iso_codes
NEW_LANG_KEY = '__new__'
diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py
index 9c36c9d7c54..0af1279e909 100644
--- a/openerp/addons/base/module/wizard/base_import_language.py
+++ b/openerp/addons/base/module/wizard/base_import_language.py
@@ -19,10 +19,11 @@
#
##############################################################################
-import tools
import base64
from tempfile import TemporaryFile
-from osv import osv, fields
+
+from openerp import tools
+from openerp.osv import osv, fields
class base_language_import(osv.osv_memory):
""" Language Import """
diff --git a/openerp/addons/base/module/wizard/base_language_install.py b/openerp/addons/base/module/wizard/base_language_install.py
index fd25a84f196..4e33dbeb344 100644
--- a/openerp/addons/base/module/wizard/base_language_install.py
+++ b/openerp/addons/base/module/wizard/base_language_install.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import osv, fields
-from tools.translate import _
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class base_language_install(osv.osv_memory):
""" Install Language"""
diff --git a/openerp/addons/base/module/wizard/base_module_configuration.py b/openerp/addons/base/module/wizard/base_module_configuration.py
index f38023294f9..cbd4656baea 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration.py
+++ b/openerp/addons/base/module/wizard/base_module_configuration.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class base_module_configuration(osv.osv_memory):
diff --git a/openerp/addons/base/module/wizard/base_module_import.py b/openerp/addons/base/module/wizard/base_module_import.py
index 8734a5e0032..67408b60669 100644
--- a/openerp/addons/base/module/wizard/base_module_import.py
+++ b/openerp/addons/base/module/wizard/base_module_import.py
@@ -19,14 +19,14 @@
#
##############################################################################
-import os
-import tools
-
-import zipfile
-from StringIO import StringIO
import base64
-from tools.translate import _
-from osv import osv, fields
+import os
+from StringIO import StringIO
+import zipfile
+
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
ADDONS_PATH = tools.config['addons_path'].split(",")[-1]
diff --git a/openerp/addons/base/module/wizard/base_module_update.py b/openerp/addons/base/module/wizard/base_module_update.py
index fc9b0749cb3..e2d8ce01d4a 100644
--- a/openerp/addons/base/module/wizard/base_module_update.py
+++ b/openerp/addons/base/module/wizard/base_module_update.py
@@ -18,7 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+
+from openerp.osv import osv, fields
class base_module_update(osv.osv_memory):
""" Update Module """
@@ -54,4 +55,4 @@ class base_module_update(osv.osv_memory):
}
return res
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py
index abfbc445316..470557c3712 100644
--- a/openerp/addons/base/module/wizard/base_update_translations.py
+++ b/openerp/addons/base/module/wizard/base_update_translations.py
@@ -19,10 +19,11 @@
#
##############################################################################
-from osv import osv, fields
-import tools
import cStringIO
-from tools.translate import _
+
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class base_update_translations(osv.osv_memory):
def _get_languages(self, cr, uid, context):
diff --git a/openerp/addons/base/report/preview_report.py b/openerp/addons/base/report/preview_report.py
index 32a0e07668b..137bebb72b7 100644
--- a/openerp/addons/base/report/preview_report.py
+++ b/openerp/addons/base/report/preview_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from report import report_sxw
+from openerp.report import report_sxw
class rmlparser(report_sxw.rml_parse):
def set_context(self, objects, data, ids, report_type = None):
diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index e8adecc1d1a..752bb03033a 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -19,8 +19,6 @@
#
##############################################################################
-import tools
-
import res_country
import res_lang
import res_partner
diff --git a/openerp/addons/base/res/ir_property.py b/openerp/addons/base/res/ir_property.py
index 4768ba1e0d0..07875e5efd0 100644
--- a/openerp/addons/base/res/ir_property.py
+++ b/openerp/addons/base/res/ir_property.py
@@ -19,10 +19,11 @@
#
##############################################################################
-from osv import osv,fields
-from tools.misc import attrgetter
import time
+from openerp.osv import osv,fields
+from openerp.tools.misc import attrgetter
+
# -------------------------------------------------------------------------
# Properties
# -------------------------------------------------------------------------
diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 5dec91990b4..fa8516bece2 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class Bank(osv.osv):
_description='Bank'
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index b2f3e812145..10e76ab0882 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -19,14 +19,14 @@
#
##############################################################################
-from osv import osv
-from osv import fields
import os
-import tools
+
import openerp
from openerp import SUPERUSER_ID
-from tools.translate import _
-from tools.safe_eval import safe_eval as eval
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval as eval
class multi_company_default(osv.osv):
"""
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 1aa108c14d2..9e901630db1 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -18,14 +18,14 @@
# along with this program. If not, see .
#
##############################################################################
+
import logging
from operator import attrgetter, itemgetter
-from osv import osv, fields
-from tools.translate import _
-import netsvc
-from tools import ustr
-import pooler
+from openerp import netsvc, pooler
+from openerp.osv import osv, fields
+from openerp.tools import ustr
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index 98a3b769a11..a1b8ad29ac0 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
def location_name_search(self, cr, user, name='', args=None, operator='ilike',
context=None, limit=100):
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index c1f4bd0b5c3..efc63378ae5 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -18,14 +18,14 @@
# along with this program. If not, see .
#
##############################################################################
+
import re
import time
-import netsvc
-from osv import fields, osv
-import tools
-from tools import float_round, float_is_zero, float_compare
-from tools.translate import _
+from openerp import netsvc, tools
+from openerp.osv import fields, osv
+from openerp.tools import float_round, float_is_zero, float_compare
+from openerp.tools.translate import _
CURRENCY_DISPLAY_PATTERN = re.compile(r'(\w+)\s*(?:\((.*)\))?')
diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 6c62877a89a..87e5a0a42c9 100644
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -20,14 +20,14 @@
##############################################################################
import locale
+from locale import localeconv
import logging
import re
-from osv import fields, osv
-from locale import localeconv
-import tools
-from tools.safe_eval import safe_eval as eval
-from tools.translate import _
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 07dba6b0d32..3ba277f04e0 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -20,17 +20,17 @@
##############################################################################
import datetime
-import math
-import openerp
-from osv import osv, fields
-from openerp import SUPERUSER_ID
-import re
-import tools
-from tools.translate import _
import logging
-import pooler
-import pytz
from lxml import etree
+import math
+import pytz
+import re
+
+import openerp
+from openerp import SUPERUSER_ID
+from openerp import pooler, tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class format_address(object):
def fields_view_get_address(self, cr, uid, arch, context={}):
diff --git a/openerp/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py
index b1e3bf88505..5880d4ad5b2 100644
--- a/openerp/addons/base/res/res_request.py
+++ b/openerp/addons/base/res/res_request.py
@@ -19,9 +19,10 @@
#
##############################################################################
-from osv import osv, fields
import time
+from openerp.osv import osv, fields
+
def _links_get(self, cr, uid, context=None):
obj = self.pool.get('res.request.link')
ids = obj.search(cr, uid, [], context=context)
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index dac1c07a169..4cc1acdc6d5 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -25,17 +25,16 @@ from functools import partial
import logging
from lxml import etree
from lxml.builder import E
-import netsvc
-from openerp import SUPERUSER_ID
-import openerp
-import openerp.exceptions
-from osv import fields,osv
-from osv.orm import browse_record
-import pooler
import random
-from service import security
-import tools
-from tools.translate import _
+
+import openerp
+from openerp import SUPERUSER_ID
+from openerp import netsvc, pooler, tools
+import openerp.exceptions
+from openerp.osv import fields,osv
+from openerp.osv.orm import browse_record
+from openerp.service import security
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)