diff --git a/addons/account/account.py b/addons/account/account.py
index 98e51d0cf4f..42211939894 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -19,19 +19,19 @@
#
##############################################################################
-import time
+import logging
from datetime import datetime
from dateutil.relativedelta import relativedelta
from operator import itemgetter
+import time
-import logging
-import pooler
-from osv import fields, osv
-import decimal_precision as dp
-from tools.translate import _
-from tools.float_utils import float_round
from openerp import SUPERUSER_ID
-import tools
+from openerp import pooler, tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools.float_utils import float_round
+
+import openerp.addons.decimal_precision as dp
_logger = logging.getLogger(__name__)
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 066f8d1abec..7120625d8ab 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields
-from osv import osv
-from tools.translate import _
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp.tools.translate import _
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index f0da630ec1d..f2bc9a5c9a1 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class bank(osv.osv):
_inherit = "res.partner.bank"
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e7e3f740067..6ddcb4b20c5 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import decimal_precision as dp
class account_bank_statement(osv.osv):
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index c1f30824461..a292d811ab4 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -22,8 +22,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import decimal_precision as dp
class account_cashbox_line(osv.osv):
diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py
index 62bcf9dcbcd..a4de5ade6af 100644
--- a/addons/account/account_financial_report.py
+++ b/addons/account/account_financial_report.py
@@ -24,11 +24,11 @@ from datetime import datetime
from dateutil.relativedelta import relativedelta
from operator import itemgetter
-import netsvc
-import pooler
-from osv import fields, osv
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
# ---------------------------------------------------------
# Account Financial Report
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index ec8dd677527..070c0a3ce81 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -23,10 +23,10 @@ import time
from lxml import etree
import decimal_precision as dp
-import netsvc
-import pooler
-from osv import fields, osv, orm
-from tools.translate import _
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
class account_invoice(osv.osv):
def _amount_all(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2c6e651b14b..905b1e00607 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -26,11 +26,11 @@ from operator import itemgetter
from lxml import etree
-import netsvc
-from osv import fields, osv, orm
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
import decimal_precision as dp
-import tools
+from openerp import tools
class account_move_line(osv.osv):
_name = "account.move.line"
diff --git a/addons/account/company.py b/addons/account/company.py
index 409216f29f0..a4624ae5ad5 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_company(osv.osv):
_inherit = "res.company"
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index 3e27bc5ea99..5992846abf6 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -20,7 +20,7 @@
##############################################################################
from openerp.osv import osv
-from edi import EDIMixin
+from openerp.addons.edi import EDIMixin
INVOICE_LINE_EDI_STRUCT = {
'name': True,
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 05a0f6b455e..d02e7196d4d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -19,17 +19,17 @@
#
##############################################################################
-import logging
-import time
import datetime
from dateutil.relativedelta import relativedelta
+import logging
from operator import itemgetter
from os.path import join as opj
+import time
+
+from openerp import netsvc, tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
-from tools.translate import _
-from osv import fields, osv
-import netsvc
-import tools
_logger = logging.getLogger(__name__)
class account_installer(osv.osv_memory):
diff --git a/addons/account/ir_sequence.py b/addons/account/ir_sequence.py
index a98b7e87d77..56e1a4d0367 100644
--- a/addons/account/ir_sequence.py
+++ b/addons/account/ir_sequence.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class ir_sequence_fiscalyear(osv.osv):
_name = 'account.sequence.fiscalyear'
diff --git a/addons/account/partner.py b/addons/account/partner.py
index b5e0a9538ef..ce3ac41e756 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -20,9 +20,10 @@
##############################################################################
from operator import itemgetter
-from osv import fields, osv
import time
+from openerp.osv import fields, osv
+
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
diff --git a/addons/account/product.py b/addons/account/product.py
index 0a6a0eda10c..ce1ac83d6dd 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_category(osv.osv):
_inherit = "product.category"
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 764bedeb2b3..f4927331ca8 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -19,8 +19,7 @@
#
##############################################################################
-from osv import fields
-from osv import osv
+from openerp.osv import fields, osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py
index 4f7768a7b19..50f98fd0ee0 100644
--- a/addons/account/project/report/account_journal.py
+++ b/addons/account/project/report/account_journal.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
#
# Use period and Journal for selection or resources
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 42e36744cb8..2aa9f2c549e 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -20,7 +20,8 @@
##############################################################################
import time
-from report import report_sxw
+
+from openerp.report import report_sxw
class account_analytic_balance(report_sxw.rml_parse):
diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py
index 88d56108550..e91de96940e 100644
--- a/addons/account/project/report/analytic_journal.py
+++ b/addons/account/project/report/analytic_journal.py
@@ -20,8 +20,9 @@
##############################################################################
import time
-import pooler
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
#
# Use period and Journal for selection or resources
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index 6ca17a7ac0a..04b8edeb166 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import pooler
import time
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
class account_analytic_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py
index 6ba8e724d35..829dd03df02 100644
--- a/addons/account/project/report/inverted_analytic_balance.py
+++ b/addons/account/project/report/inverted_analytic_balance.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import pooler
import time
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
class account_inverted_analytic_balance(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index 4d874fe50ee..1fe77f6e878 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index 81d325ee8f5..81d6c192962 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_balance(osv.osv_memory):
_name = 'account.analytic.balance'
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index 92367e27da5..01c606d5f08 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_chart(osv.osv_memory):
_name = 'account.analytic.chart'
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 186d39c4859..fdb8eafb402 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_cost_ledger_journal_report(osv.osv_memory):
_name = 'account.analytic.cost.ledger.journal.report'
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 246f02c20dc..1c74c61e31f 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -18,9 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
+
import time
-from osv import osv, fields
+from openerp.osv import osv, fields
class account_analytic_cost_ledger(osv.osv_memory):
_name = 'account.analytic.cost.ledger'
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index 95365716a22..10f97baf755 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_inverted_balance(osv.osv_memory):
_name = 'account.analytic.inverted.balance'
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index 3d6bf0f5447..e70649cd406 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_journal_report(osv.osv_memory):
_name = 'account.analytic.journal.report'
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index 54979d79b8a..c5a496527c1 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class project_account_analytic_line(osv.osv_memory):
_name = "project.account.analytic.line"
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 2812fd409e6..897b8366b7a 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class aged_trial_report(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index 02c1c508237..dad0dedc9fc 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class analytic_entries_report(osv.osv):
_name = "analytic.entries.report"
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index fdda9cb11ce..2a445984b27 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class account_balance(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index ebb8012f5e7..8dae208a7a5 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
#
# Use period and Journal for selection or resources
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 676f833eeaf..b354732217a 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
import decimal_precision as dp
class account_entries_report(osv.osv):
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
index 5380383f537..b06aadce212 100644
--- a/addons/account/report/account_financial_report.py
+++ b/addons/account/report/account_financial_report.py
@@ -20,9 +20,9 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
-from tools.translate import _
+from openerp.tools.translate import _
class report_account_common(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index 0ffa08b31ef..4f63411478c 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 38f2392f740..498cb1369a8 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -28,7 +28,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class general_ledger(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index a001b6b4f52..9798dbffdf8 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
+from openerp import tools
import decimal_precision as dp
-from osv import fields,osv
+from openerp.osv import fields,osv
class account_invoice_report(osv.osv):
_name = "account.invoice.report"
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 45472fc7e45..769a8335f55 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index fcc112d9d81..53edbbe9685 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -21,8 +21,8 @@
import time
-from tools.translate import _
-from report import report_sxw
+from openerp.tools.translate import _
+from openerp.report import report_sxw
from common_report_header import common_report_header
class partner_balance(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index ca0515c9f08..f72e81fbc08 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -21,9 +21,9 @@
import time
import re
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
-from tools.translate import _
+from openerp.tools.translate import _
class third_party_ledger(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_print_invoice.py b/addons/account/report/account_print_invoice.py
index 280bc0bc7a0..75680810254 100644
--- a/addons/account/report/account_print_invoice.py
+++ b/addons/account/report/account_print_invoice.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class account_invoice(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 4ddedc102f5..68c1c35ef53 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -21,8 +21,8 @@
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
class Overdue(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 56e324bc361..82619f49c3c 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import pooler
-import tools
-from osv import fields,osv
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields,osv
def _code_get(self, cr, uid, context=None):
acc_type_obj = self.pool.get('account.account.type')
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index cef1cf54af0..b3cbcb441bf 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -22,7 +22,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class tax_report(report_sxw.rml_parse, common_report_header):
_name = 'report.account.vat.declaration'
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
index 40d9364981f..028ba260871 100644
--- a/addons/account/report/account_treasury_report.py
+++ b/addons/account/report/account_treasury_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
import decimal_precision as dp
class account_treasury_report(osv.osv):
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index c5719d98b96..cedc4ccf5c4 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import pooler
-from tools.translate import _
+from openerp import pooler
+from openerp.tools.translate import _
class common_report_header(object):
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8f525795d1c..72d30c11cfd 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,9 +25,9 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
from os.path import join as opj
-from tools.translate import _
-from osv import osv, fields
-import tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
class account_config_settings(osv.osv_memory):
_name = 'account.config.settings'
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index 60bb6152a9b..9564b4e57c6 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
"""Inherit res.currency to handle accounting date values when converting currencies"""
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index b4355e79129..88d31b5b6c5 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_automatic_reconcile(osv.osv_memory):
_name = 'account.automatic.reconcile'
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index d51df1e4d70..73fd52b3fcb 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_change_currency(osv.osv_memory):
_name = 'account.change.currency'
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index a9d3739103f..32b83a0a670 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_chart(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 4f9d6abf099..dde07eb7034 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class accounting_report(osv.osv_memory):
_name = "accounting.report"
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index e11b4dcd34b..d4f7b3e6654 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.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 account_fiscalyear_close(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index f57684a1460..746f1c47976 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.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 account_fiscalyear_close_state(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 38a22baa9f1..814dbea6fac 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -21,9 +21,9 @@
import time
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class account_invoice_refund(osv.osv_memory):
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 7c7f6882b75..f79b4c046e3 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
-import netsvc
-import pooler
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp import netsvc
+from openerp import pooler
class account_invoice_confirm(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index b91c195f6b3..7edd7923f4c 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_journal_select(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 2b29bf6b30d..283068ae693 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.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 account_move_bank_reconcile(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index e23212c514c..76af8538e05 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.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 account_move_line_reconcile_select(osv.osv_memory):
_name = "account.move.line.reconcile.select"
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index a99750a36fe..b56621f2114 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_move_line_select(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index 26421eb4c0c..f9009fc8199 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_move_line_unreconcile_select(osv.osv_memory):
_name = "account.move.line.unreconcile.select"
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 1b5622a589d..3b5d956d381 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.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 account_open_closed_fiscalyear(osv.osv_memory):
_name = "account.open.closed.fiscalyear"
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 086485ac0f2..fad757c0ff9 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.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 account_period_close(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 6f6c8f07844..0e2bca4ff68 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import decimal_precision as dp
class account_move_line_reconcile(osv.osv_memory):
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 380d25001c7..1c317111888 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_partner_reconcile_process(osv.osv_memory):
_name = 'account.partner.reconcile.process'
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 4e52066b49e..e883a59c102 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_balance_report(osv.osv_memory):
_inherit = "account.common.account.report"
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index c4167322b90..1054e7fa285 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -22,8 +22,8 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_aged_trial_balance(osv.osv_memory):
_inherit = 'account.common.partner.report'
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index 046aec4690d..da8be6d4735 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_central_journal(osv.osv_memory):
_name = 'account.central.journal'
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 4438484aaaf..b84c35ba243 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -22,8 +22,8 @@
import time
from lxml import etree
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_common_report(osv.osv_memory):
_name = "account.common.report"
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index a27241a37ff..7cedf427386 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_account_report(osv.osv_memory):
_name = 'account.common.account.report'
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index ed0f03df5b5..609c2840ca6 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_journal_report(osv.osv_memory):
_name = 'account.common.journal.report'
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index a2acdc4b988..9779005b0de 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_partner_report(osv.osv_memory):
_name = 'account.common.partner.report'
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index 631de5f1260..4a170a84db1 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_general_journal(osv.osv_memory):
_inherit = "account.common.journal.report"
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 8078da372ca..a10ff624fee 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_report_general_ledger(osv.osv_memory):
_inherit = "account.common.account.report"
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 80ee455456c..33a7a42072c 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_partner_balance(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 60ac20a42ed..d1e6dd9809e 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_partner_ledger(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index 0ffbde3fa9e..b91fe04660a 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from lxml import etree
class account_print_journal(osv.osv_memory):
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 32795f0f5b7..b2cbdc4961b 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -18,10 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
-import netsvc
-from tools.translate import _
+from openerp import netsvc
+from openerp.tools.translate import _
class account_state_open(osv.osv_memory):
_name = 'account.state.open'
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 0dae5aa90a8..f5babc4fd87 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_subscription_generate(osv.osv_memory):
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 16796a5d57c..84859e2077c 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_tax_chart(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 5494875cf26..ff592a329c7 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_unreconcile(osv.osv_memory):
_name = "account.unreconcile"
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 7ce73caba55..795284c8fef 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_use_model(osv.osv_memory):
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 1a53c9dfd53..faf7f8e2ccd 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class validate_account_move(osv.osv_memory):
_name = "validate.account.move"
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 85fce5de000..a60a7906e28 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_vat_declaration(osv.osv_memory):
_name = 'account.vat.declaration'
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index b5d1cc37776..b7eb69b1feb 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-from osv import osv, fields
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class CashBox(osv.osv_memory):
_register = False
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 466db63e61e..b6cbd1a459c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -19,11 +19,12 @@
#
##############################################################################
-from osv import osv, fields
-from osv.orm import intersect, except_orm
-import tools.sql
-from tools.translate import _
-from decimal_precision import decimal_precision as dp
+from openerp.osv import osv, fields
+from openerp.osv.orm import intersect, except_orm
+import openerp.tools
+from openerp.tools.translate import _
+
+from openerp.addons.decimal_precision import decimal_precision as dp
class account_analytic_account(osv.osv):
@@ -518,7 +519,7 @@ class account_analytic_account_summary_user(osv.osv):
}
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
+ openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (
with mu as
(select max(id) as max_user from res_users)
@@ -553,7 +554,7 @@ class account_analytic_account_summary_month(osv.osv):
}
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
+ openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
'SELECT ' \
'(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id * 1000000::bigint))::bigint AS id, ' \
diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py
index 065fdc5b907..70dd9a0e9d5 100644
--- a/addons/account_analytic_analysis/cron_account_analytic_account.py
+++ b/addons/account_analytic_analysis/cron_account_analytic_account.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from osv import osv
from mako.template import Template
import time
try:
@@ -7,7 +6,8 @@ try:
except ImportError:
import StringIO
-import tools
+from openerp import tools
+from openerp.osv import osv
MAKO_TEMPLATE = u"""Hello ${user.name},
diff --git a/addons/account_analytic_analysis/res_config.py b/addons/account_analytic_analysis/res_config.py
index 94fe769fdd4..90e3cff01fb 100644
--- a/addons/account_analytic_analysis/res_config.py
+++ b/addons/account_analytic_analysis/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 4fe654adffc..0fe3e9f2c14 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_analytic_default(osv.osv):
_name = "account.analytic.default"
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 91caa6936bc..99cb0c4ebc4 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -22,9 +22,9 @@
import time
from lxml import etree
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 5b22f5e266c..008d9913ec4 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class crossovered_analytic(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index a68321c334a..640443c8a0b 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_crossovered_analytic(osv.osv_memory):
_name = "account.crossovered.analytic"
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index a8ac8401569..7038a6f1025 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class analytic_plan_create_model(osv.osv_memory):
_name = "analytic.plan.create.model"
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 26271015b7e..52d7dde089d 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -21,7 +21,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index 87ca24753d6..443642d048b 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_category(osv.osv):
_inherit = "product.category"
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index 30d196a84ec..959f8b7eb49 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class purchase_order(osv.osv):
_name = "purchase.order"
diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
index 9ddfab86a94..6243fd285d0 100644
--- a/addons/account_anglo_saxon/stock.py
+++ b/addons/account_anglo_saxon/stock.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
#----------------------------------------------------------
# Stock Picking
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index a44226e76c8..03181cac92f 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -23,7 +23,7 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
+from openerp.osv import fields, osv
import decimal_precision as dp
class account_asset_category(osv.osv):
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 4b38834bdc3..7e2f24f0d0a 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_invoice(osv.osv):
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 583e5534613..1554880ac38 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class asset_asset_report(osv.osv):
_name = "asset.asset.report"
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index 227f4e53229..19782c76367 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -21,7 +21,7 @@
import time
from lxml import etree
-from osv import osv, fields
+from openerp.osv import fields, osv
class asset_modify(osv.osv_memory):
_name = 'asset.modify'
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
index 4492f08c6e5..cc870329840 100755
--- a/addons/account_asset/wizard/wizard_asset_compute.py
+++ b/addons/account_asset/wizard/wizard_asset_compute.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class asset_depreciation_confirmation_wizard(osv.osv_memory):
_name = "asset.depreciation.confirmation.wizard"
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 3d097d3c757..8d2ad73c689 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -21,9 +21,9 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class account_bank_statement(osv.osv):
_inherit = 'account.bank.statement'
diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
index 5dcaafe4845..9f28b083603 100644
--- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
+++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
@@ -21,8 +21,8 @@
##############################################################################
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/account_bank_statement_extensions/res_partner_bank.py b/addons/account_bank_statement_extensions/res_partner_bank.py
index de7c061de76..f866634a08c 100644
--- a/addons/account_bank_statement_extensions/res_partner_bank.py
+++ b/addons/account_bank_statement_extensions/res_partner_bank.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class res_partner_bank(osv.osv):
_inherit = 'res.partner.bank'
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
index 40d0be76d10..46d71354d4b 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class cancel_statement_line(osv.osv_memory):
_name = 'cancel.statement.line'
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
index 20b57708be2..3a887a52441 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class confirm_statement_line(osv.osv_memory):
_name = 'confirm.statement.line'
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 48037825349..723545c76a3 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -21,8 +21,8 @@
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import decimal_precision as dp
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index e29af98b6a3..eed8ded213f 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -22,8 +22,8 @@
import time
import datetime
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class analytic_account_budget_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index c7d4ba58f68..f00eb8a3713 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
tot = {}
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 9f2f59fe715..e1710ae6f84 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -22,8 +22,8 @@
import time
import datetime
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
import operator
import osv
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index 6397ee87c76..0cdb7504f75 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_analytic(osv.osv_memory):
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index e120bc47caa..97fc43c8e9d 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_crossvered_report(osv.osv_memory):
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index a5eeeb32ff9..f42c39ec6ac 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_crossvered_summary_report(osv.osv_memory):
"""
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 6ef22c649e9..5db6c68d508 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_report(osv.osv_memory):
diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py
index 4dbbc245033..1600898fc3a 100644
--- a/addons/account_check_writing/account.py
+++ b/addons/account_check_writing/account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class account_journal(osv.osv):
_inherit = "account.journal"
diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index aa0a29d7845..93e9acedefe 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
from tools.amount_to_text_en import amount_to_text
from lxml import etree
diff --git a/addons/account_check_writing/report/check_print.py b/addons/account_check_writing/report/check_print.py
index fd52c96b9aa..57360025623 100644
--- a/addons/account_check_writing/report/check_print.py
+++ b/addons/account_check_writing/report/check_print.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class report_print_check(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 3a09707c4b3..074dcd6ae17 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
from lxml import etree
-from tools.translate import _
+from openerp.tools.translate import _
class followup(osv.osv):
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 90dd5969d53..83a759b37e5 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -21,8 +21,8 @@
import time
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class report_rappel(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index ceb8a389c0e..9ca8d3c2332 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class account_followup_stat(osv.osv):
_name = "account_followup.stat"
diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py
index c46977bd6b5..28e2e2f38ec 100644
--- a/addons/account_followup/tests/test_account_followup.py
+++ b/addons/account_followup/tests/test_account_followup.py
@@ -2,10 +2,10 @@
import datetime
-import tools
+from openerp import tools
from openerp.tests.common import TransactionCase
-import netsvc
+from openerp import netsvc
class TestAccountFollowup(TransactionCase):
def setUp(self):
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index db93b3c63a8..488123b55d1 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -22,9 +22,9 @@
import datetime
import time
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_followup_stat_by_partner(osv.osv):
_name = "account_followup.stat.by.partner"
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index ec4feca9b81..7c8560fc9e8 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class Invoice(osv.osv):
_inherit = 'account.invoice'
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 047b472e53b..35c30c686e8 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -20,8 +20,8 @@
##############################################################################
from operator import itemgetter
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_move_line(osv.osv):
_inherit = "account.move.line"
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 84eeddfb5db..d67db60e590 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -22,8 +22,8 @@
import logging
import time
-from osv import osv, fields
-import netsvc
+from openerp.osv import fields, osv
+from openerp import netsvc
_logger = logging.getLogger(__name__)
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 5f9708f876c..c43ee4d1d23 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -21,8 +21,8 @@
import time
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class payment_order(report_sxw.rml_parse):
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 455475b0ae5..f4d695a05d1 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -22,7 +22,7 @@
import time
from lxml import etree
-from osv import osv, fields
+from openerp.osv import fields, osv
class payment_order_create(osv.osv_memory):
"""
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 3c16618f3d2..03ff46125f5 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
#TODO:REMOVE this wizard is not used
class account_payment_make_payment(osv.osv_memory):
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index fffe6c17b92..edd47065e3a 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -22,7 +22,7 @@
import time
from lxml import etree
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_payment_populate_statement(osv.osv_memory):
_name = "account.payment.populate.statement"
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 8b87b3f40ae..5b344600599 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_move(osv.osv):
_inherit = 'account.move'
diff --git a/addons/account_sequence/account_sequence_installer.py b/addons/account_sequence/account_sequence_installer.py
index 91eec5d58ad..e800bbad7ee 100644
--- a/addons/account_sequence/account_sequence_installer.py
+++ b/addons/account_sequence/account_sequence_installer.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_sequence_installer(osv.osv_memory):
_name = 'account.sequence.installer'
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ffc7cf1769d..83cb384517a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -22,10 +22,10 @@
import time
from lxml import etree
-import netsvc
-from osv import osv, fields
+from openerp import netsvc
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class res_company(osv.osv):
_inherit = "res.company"
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index af8405c1ec9..13c4b9aed9b 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class invoice(osv.osv):
_inherit = 'account.invoice'
diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py
index 146fcbc258a..c23c7f4d384 100644
--- a/addons/account_voucher/report/account_voucher.py
+++ b/addons/account_voucher/report/account_voucher.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class report_voucher(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_voucher/report/account_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py
index 6a5762be493..1bc411947f6 100644
--- a/addons/account_voucher/report/account_voucher_print.py
+++ b/addons/account_voucher/report/account_voucher_print.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class report_voucher_print(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index fdadfc6bc94..2ab76c252f5 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -18,8 +18,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class sale_receipt_report(osv.osv):
_name = "sale.receipt.report"
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 6002f74c6e0..b0f9bb34410 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_statement_from_invoice_lines(osv.osv_memory):
"""
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 782fbc4f3ee..6f0e4c11887 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -22,9 +22,9 @@
import time
from datetime import datetime
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
import decimal_precision as dp
class account_analytic_account(osv.osv):
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index ee92b469744..2f1f81a2e93 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from osv.orm import intersect, except_orm
import tools.sql
-from tools.translate import _
+from openerp.tools.translate import _
from decimal_precision import decimal_precision as dp
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index c2a7ae8f05a..348fc08d6ba 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.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 _
import decimal_precision as dp
class analytic_user_funct_grid(osv.osv):
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 2326a4184ae..e26cd7b3c04 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -29,8 +29,8 @@ except ImportError:
import pickle
import random
import datetime
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
from itertools import groupby
from operator import itemgetter
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 54284dee4da..5e138203dc3 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
from osv.osv import object_proxy
-from tools.translate import _
-import pooler
+from openerp.tools.translate import _
+from openerp import pooler
import time
-import tools
+from openerp import tools
from openerp import SUPERUSER_ID
class audittrail_rule(osv.osv):
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index 76284e75511..d06da281933 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
class audittrail_view_log(osv.osv_memory):
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index e1317c84c88..a63d52209ba 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -23,9 +23,9 @@ import logging
from ldap.filter import filter_format
import openerp.exceptions
-import pooler
-import tools
-from osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
from openerp import SUPERUSER_ID
_logger = logging.getLogger(__name__)
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
index 9b02ce42991..feea2d8d396 100644
--- a/addons/auth_openid/res_users.py
+++ b/addons/auth_openid/res_users.py
@@ -21,7 +21,7 @@
from openerp.modules.registry import RegistryManager
from openerp.osv import osv, fields
import openerp.exceptions
-import tools
+from openerp import tools
import utils
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 856d2626f69..a7798f40bb1 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -24,12 +24,12 @@ from datetime import timedelta
import re
import time
-from osv import fields, osv, orm
-from tools.translate import _
-from tools.safe_eval import safe_eval
-from tools import ustr
-import pooler
-import tools
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
+from openerp.tools import ustr
+from openerp import pooler
+from openerp import tools
def get_datetime(date_field):
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4c4e7a16876..038ba8b2e77 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -23,13 +23,13 @@ from datetime import datetime, timedelta, date
from dateutil import parser
from dateutil import rrule
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
-from service import web_services
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.service import web_services
+from openerp.tools.translate import _
import pytz
import re
import time
-import tools
+from openerp import tools
months = {
1: "January", 2: "February", 3: "March", 4: "April", \
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 9ceaea671ca..b9bc7ad1357 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
import base_calendar
from base_status.base_state import base_state
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 14e029eb988..b3cc252c566 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -38,9 +38,9 @@
from random import seed, sample
from string import ascii_letters, digits
-from osv import fields,osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp import pooler
+from openerp.tools.translate import _
from service import security
import logging
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
index 7b864aba8ce..0ade9c54625 100644
--- a/addons/base_gengo/ir_translation.py
+++ b/addons/base_gengo/ir_translation.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 _
LANG_CODE_MAPPING = {
'ar_SA': ('ar', 'Arabic'),
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 22d7b343939..3d038ac0813 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_company(osv.Model):
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index ff492a8d34b..0872af2d0f3 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -20,8 +20,8 @@
##############################################################################
import string
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
# Reference Examples of IBAN
_ref_iban = { 'al':'ALkk BBBS SSSK CCCC CCCC CCCC CCCC', 'ad':'ADkk BBBB SSSS CCCC CCCC CCCC',
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 46a6e1fe870..825d1d29c4c 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
from openerp_sxw2rml import sxw2rml
from StringIO import StringIO
import base64
-import pooler
-import addons
+from openerp import pooler
+from openerp import addons
class report_xml(osv.osv):
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
index d21fd11af00..bfda6e7a30f 100644
--- a/addons/base_report_designer/installer.py
+++ b/addons/base_report_designer/installer.py
@@ -19,11 +19,11 @@
#
##############################################################################
-from osv import fields
-from osv import osv
+from openerp.osv import fields
+from openerp.osv import osv
import base64
-from tools.translate import _
-import addons
+from openerp.tools.translate import _
+from openerp import addons
class base_report_designer_installer(osv.osv_memory):
_name = 'base_report_designer.installer'
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 03d1ac19d7e..34e6a266fd5 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -20,14 +20,14 @@
#
##############################################################################
import time
-import wizard
+from openerp import wizard
import osv
-import pooler
+from openerp import pooler
import urllib
import base64
-import tools
-from tools.translate import _
-from osv import osv, fields
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class base_report_sxw(osv.osv_memory):
"""Base Report sxw """
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index e8e24969f2a..3e7c1d1f846 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -21,10 +21,10 @@
import simplejson
import cgi
-import pooler
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
from lxml import etree
# Specify Your Terminology will move to 'partner' module
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index e7898395d62..b319d64ee64 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class base_config_settings(osv.osv_memory):
_name = 'base.config.settings'
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 9858a7fe0cc..afe753ebdab 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.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 base_stage(object):
""" Base utility mixin class for objects willing to manage their stages.
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index cebf5537485..0fb458bd13b 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.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 base_state(object):
""" Base utility mixin class for objects willing to manage their state.
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 51c1663d366..3772ec01b33 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -32,9 +32,9 @@ except ImportError:
"Install it to support more countries, for example with `easy_install vatnumber`.")
vatnumber = None
-from osv import osv, fields
+from openerp.osv import fields, osv
from tools.misc import ustr
-from tools.translate import _
+from openerp.tools.translate import _
_ref_vat = {
'at': 'ATU12345675',
diff --git a/addons/base_vat/res_company.py b/addons/base_vat/res_company.py
index 1c63aa20f07..9959ce82833 100644
--- a/addons/base_vat/res_company.py
+++ b/addons/base_vat/res_company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class res_company_vat (osv.osv):
_inherit = 'res.company'
diff --git a/addons/board/board.py b/addons/board/board.py
index a76bff7a66b..ba5da0db6e1 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -22,8 +22,9 @@
from operator import itemgetter
from textwrap import dedent
-from osv import fields, osv
-import tools
+
+from openerp import tools
+from openerp.osv import fields, osv
class board_board(osv.osv):
_name = 'board.board'
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 368656224ac..8e6d9dd1510 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -22,10 +22,10 @@
import base64
import time
from lxml import etree
-from osv import fields
-from osv import osv
-import tools
-from tools.translate import _
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp import tools
+from openerp.tools.translate import _
MAX_LEVEL = 15
AVAILABLE_STATES = [
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 4a8ee98fbae..b17ba5665d7 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -20,12 +20,12 @@
##############################################################################
import re
-import tools
+from openerp import tools
-from tools.translate import _
-from tools import ustr
-from osv import fields
-from osv import osv
+from openerp.tools.translate import _
+from openerp.tools import ustr
+from openerp.osv import fields
+from openerp.osv import osv
import crm
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 80ac2fa16d3..1acd7faccc2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -22,11 +22,11 @@
from base_status.base_stage import base_stage
import crm
from datetime import datetime
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
-import tools
-from tools.translate import _
-from tools import html2plaintext
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
from base.res.res_partner import format_address
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 62fc53364ee..cc10ba9a597 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 9b63f984b4a..9ef73017be0 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -22,10 +22,10 @@
from base_status.base_state import base_state
import crm
from datetime import datetime
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
-from tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
+from openerp.tools.translate import _
class crm_phonecall(base_state, osv.osv):
""" Model for CRM phonecalls """
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index b87d6a3b653..b11fac31dcf 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv,orm
+from openerp.osv import fields,osv,orm
class crm_segmentation(osv.osv):
'''
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 25598abc3ea..323d6e4c3d6 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
from .. import crm
AVAILABLE_STATES = [
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 8ee32cfc416..c4b014bb86f 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
from .. import crm
AVAILABLE_STATES = [
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 08d472c724d..45e36cf7046 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -20,13 +20,13 @@
##############################################################################
import os, time
-import netsvc
+from openerp import netsvc
import random
import StringIO
-from report.render import render
-from report.interface import report_int
+from openerp.report.render import render
+from openerp.report.interface import report_int
from pychart import *
theme.use_color = 1
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 6f431b90cba..229ad0189ff 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class crm_configuration(osv.osv_memory):
_name = 'sale.config.settings'
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index e43534476fd..30f68145da7 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_partner(osv.osv):
""" Inherits partner and adds CRM information in the partner form """
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index ea96e1d16f1..13000fffdc8 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import tools
import re
class crm_lead2opportunity_partner(osv.osv_memory):
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index c48990f5866..8ea34d5a560 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_lead2partner(osv.osv_memory):
""" Converts lead to partner """
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index edfefb5e5bc..2e91e181419 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -17,8 +17,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_merge_opportunity(osv.osv_memory):
"""Merge two Opportunities"""
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 873dd6ab36e..ad9d30c80a4 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import time
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index aa8f4a2a036..9f7a10d27e6 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_partner2opportunity(osv.osv_memory):
"""Converts Partner To Opportunity"""
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index a01765220b8..4e21e01b834 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class crm_phonecall2meeting(osv.osv_memory):
""" Phonecall to Meeting """
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 7305cbd8b5f..8d7a8b0d592 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_phonecall2opportunity(osv.osv_memory):
""" Converts Phonecall to Opportunity"""
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 715b7396c66..de95ca11b92 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_phonecall2partner(osv.osv_memory):
""" Converts phonecall to partner """
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 2cdfb0387e6..d0bcd12dbb7 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import time
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 70dcc18baf7..72f971e48a4 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,11 +22,11 @@
from base_status.base_stage import base_stage
import binascii
from crm import crm
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
-import tools
-from tools.translate import _
-from tools import html2plaintext
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
CRM_CLAIM_PENDING_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 4cda15c0969..ad56fa5e34e 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
AVAILABLE_STATES = [
('draft','Draft'),
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 92e474d6a46..aa0cb7ffa20 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class crm_claim_settings(osv.osv_memory):
_name = 'sale.config.settings'
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 373cf53aed6..febcc2a8da9 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -22,10 +22,10 @@
from base_status.base_state import base_state
from base_status.base_stage import base_stage
from crm import crm
-from osv import fields, osv
-import tools
-from tools.translate import _
-from tools import html2plaintext
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
CRM_HELPDESK_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 6496935c2d2..8d535fa07a0 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
AVAILABLE_STATES = [
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 69b2ba406ca..37a317a46d0 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
import urllib,re
import random, time
-from tools.translate import _
-import tools
+from openerp.tools.translate import _
+from openerp import tools
def geo_find(addr):
addr = addr.encode('utf8')
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index a2d6bbac2dd..07b76f34546 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
from crm import crm
AVAILABLE_STATES = [
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
index 7dccab30da2..4611fdd06e4 100644
--- a/addons/crm_partner_assign/report/crm_partner_report.py
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class crm_partner_report_assign(osv.osv):
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index ab8f20a74f5..4ca3ba0a770 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -22,10 +22,10 @@
import re
import time
-import tools
+from openerp import tools
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_lead_forward_to_partner(osv.osv_memory):
""" Forward info history to partners. """
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 7dc72f80289..08193eeb14a 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
from osv import orm
-from tools.translate import _
+from openerp.tools.translate import _
def _get_answers(cr, uid, ids):
"""
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index b13c67640fc..cb7ad220e3f 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class open_questionnaire_line(osv.osv_memory):
_name = 'open.questionnaire.line'
diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py
index b1f6aa05af0..e11fa03193f 100644
--- a/addons/crm_todo/crm_todo.py
+++ b/addons/crm_todo/crm_todo.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class project_task(osv.osv):
_inherit = 'project.task'
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index 93d69eb3093..64077ed3736 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -19,10 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-import tools
-import pooler
from openerp import SUPERUSER_ID
+from openerp import pooler, tools
+from openerp.osv import osv, fields
class decimal_precision(osv.osv):
_name = 'decimal.precision'
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index cf82011d27a..975a14c188e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
import decimal_precision as dp
class delivery_carrier(osv.osv):
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index 62008c2c7cf..e4b0ba204ac 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/delivery/report/shipping.py b/addons/delivery/report/shipping.py
index 6d3b3598987..53bdad807c0 100644
--- a/addons/delivery/report/shipping.py
+++ b/addons/delivery/report/shipping.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class shipping(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 24da03bf1d8..34896b7bcb3 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
# Overloaded sale_order to manage carriers :
class sale_order(osv.osv):
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index c3ce236dc2e..7dfd3f6ca8d 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.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 _
import decimal_precision as dp
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 5b8ec3ddd93..6ebf8ebeb3d 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
-import netsvc
+from openerp import netsvc
# import os
import nodes
# import StringIO
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 202725a1d3f..984dcf23bf2 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class ir_action_report_xml(osv.osv):
_name="ir.actions.report.xml"
diff --git a/addons/document/document.py b/addons/document/document.py
index 37a0219d143..ee288465316 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -20,13 +20,13 @@
##############################################################################
import base64
-from osv import osv, fields
+from openerp.osv import fields, osv
import os
#from psycopg2 import Binary
#from tools import config
-import tools
-from tools.translate import _
+from openerp import tools
+from openerp.tools.translate import _
import nodes
import logging
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index ec51d9bcc6c..b578fb203c5 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -20,11 +20,11 @@
##############################################################################
-from osv import osv, fields
-from osv.orm import except_orm
+from openerp.osv import fields, osv
+from openerp.osv.orm import except_orm
import logging
import nodes
-from tools.translate import _
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
class document_directory(osv.osv):
_name = 'document.directory'
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 21cb4f9dcf4..394205e57ee 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -20,9 +20,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import os
-import tools
+from openerp import tools
import base64
import errno
import logging
@@ -30,11 +30,11 @@ import shutil
from StringIO import StringIO
import psycopg2
from tools.misc import ustr
-from tools.translate import _
-from osv.orm import except_orm
+from openerp.tools.translate import _
+from openerp.osv.orm import except_orm
import random
import string
-import pooler
+from openerp import pooler
import nodes
from content_index import cntIndex
_logger = logging.getLogger(__name__)
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index aeb2e64fc97..ab0615f521a 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -20,8 +20,8 @@
##############################################################################
# import urlparse
-import pooler
-from tools.safe_eval import safe_eval
+from openerp import pooler
+from openerp.tools.safe_eval import safe_eval
from tools.misc import ustr
import errno
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 92e33c13746..c9df78e4272 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class report_document_user(osv.osv):
_name = "report.document.user"
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 6a69e638b4e..aec7f9b75a4 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class document_configuration(osv.osv_memory):
_name='document.configuration'
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 59aff85c633..b5ada070c84 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -24,7 +24,7 @@ import ftpserver
import authorizer
import abstracted_fs
import logging
-from tools import config
+from openerp.tools import config
_logger = logging.getLogger(__name__)
def start_server():
HOST = config.get('ftp_server_host', '127.0.0.1')
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 326c62f7a92..42793ccbc45 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -9,12 +9,12 @@ import errno
import glob
import fnmatch
-import pooler
-import netsvc
+from openerp import pooler
+from openerp import netsvc
import sql_db
from service import security
-from osv import osv
+from openerp.osv import osv
from document.nodes import get_node_context
def _get_month_name(month):
diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py
index 374368d60bd..93b3aa69974 100644
--- a/addons/document_ftp/res_config.py
+++ b/addons/document_ftp/res_config.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
class documnet_ftp_setting(osv.osv_memory):
_name = 'knowledge.config.settings'
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index bb4e5ea6648..1ab808c3acc 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -25,7 +25,7 @@
"""
from ftplib import FTP
-from tools import config
+from openerp.tools import config
def get_plain_ftp(timeout=10.0):
ftp = FTP()
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 8260424d653..ceb7d1a60e5 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-# from tools.translate import _
+from openerp.osv import fields, osv
+# from openerp.tools.translate import _
from .. import ftpserver
class document_ftp_browse(osv.osv_memory):
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index d0679973c5a..87aaa2331b4 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
class document_ftp_configuration(osv.osv_memory):
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index 092d39f22e9..f74cfe02a21 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import difflib
-import tools
+from openerp import tools
class document_page(osv.osv):
_name = "document.page"
diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
index 79a43f952f0..9f20fab0d99 100644
--- a/addons/document_page/wizard/document_page_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class document_page_create_menu(osv.osv_memory):
""" Create Menu """
diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py
index 13e8e79b3b7..0c20ee79c74 100644
--- a/addons/document_page/wizard/document_page_show_diff.py
+++ b/addons/document_page/wizard/document_page_show_diff.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 _
import base64
class showdiff(osv.osv_memory):
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1b826434f74..27f47977e76 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -18,14 +18,14 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
+from openerp import pooler
import sql_db
import os
import time
import errno
-import netsvc
+from openerp import netsvc
import urlparse
from DAV.constants import COLLECTION #, OBJECT
@@ -35,7 +35,7 @@ import urllib
from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
from cache import memoize
-from tools import misc
+from openerp.tools import misc
from webdav import mk_lock_response
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index cb1315140a3..d6fbcc243f8 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import nodes
-from tools import config
+from openerp.tools import config
class document_davdir(osv.osv):
_inherit = 'document.directory'
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index a8fedee4fe3..d6bb5a6655f 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -21,7 +21,7 @@
from document import nodes
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
import time
import urllib
import uuid
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 79ee471c69e..058dc1c748d 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -38,7 +38,7 @@ import xml.dom.minidom
import httplib
-from tools import config
+from openerp.tools import config
from xmlrpclib import Transport, ProtocolError
import StringIO
import base64
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index f714ff51518..e31787b73f6 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -26,8 +26,8 @@ from xml.dom.minicompat import StringTypes
import urlparse
import urllib
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
try:
from DAV import utils
@@ -36,7 +36,7 @@ try:
except ImportError:
raise osv.except_osv(_('PyWebDAV Import Error!'), _('Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/'))
-import tools
+from openerp import tools
class Text2(xml.dom.minidom.Text):
def writexml(self, writer, indent="", addindent="", newl=""):
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 70ad4d2657f..0297e4423f9 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -35,7 +35,7 @@
import logging
-import netsvc
+from openerp import netsvc
from dav_fs import openerp_dav_handler
from tools.config import config
from DAV.WebDAVServer import DAVRequestHandler
@@ -47,7 +47,7 @@ import urllib
import re
import time
from string import atoi
-import addons
+from openerp import addons
from DAV.utils import IfParser, TagList
from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
from DAV.propfind import PROPFIND
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 48a04c2a94d..5f3589bd9d5 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -31,8 +31,8 @@ import openerp
import openerp.release as release
import openerp.netsvc as netsvc
from openerp.osv import osv, fields
-from tools.translate import _
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)
EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a9bee623f66..ece42a00e02 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -23,11 +23,11 @@
import base64
import logging
-import netsvc
-from osv import osv
-from osv import fields
-import tools
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp import tools
+from openerp.tools.translate import _
from urllib import quote as quote
_logger = logging.getLogger(__name__)
diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py
index 7b350442e84..987fca43219 100644
--- a/addons/email_template/res_partner.py
+++ b/addons/email_template/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_partner(osv.osv):
"""Inherit res.partner to add a generic opt-out field that can be used
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 862c34cc426..1cfcf048691 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class email_template_preview(osv.osv_memory):
_inherit = "email.template"
diff --git a/addons/event/event.py b/addons/event/event.py
index b79d86ea35e..59a4773e2cb 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime, timedelta
-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
class event_type(osv.osv):
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 042676d0c32..481b86f032c 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class report_event_registration(osv.osv):
_name = "report.event.registration"
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index 17cf5216074..88249c5a7cd 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index e001aac9937..8611a066801 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class event_confirm(osv.osv_memory):
"""
diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 0bac50ca445..5c7373d1adb 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -19,13 +19,13 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import xmlrpclib
import string
import time
import random
from random import sample
-from tools.translate import _
+from openerp.tools.translate import _
class event_moodle(osv.osv):
_name = 'event.moodle.config.wiz'
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index f4d7fcaa013..65221b552b8 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.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 product(osv.osv):
_inherit = 'product.product'
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 68f05dfeee2..e26d5af2001 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -32,12 +32,12 @@ except ImportError:
import zipfile
import base64
-import addons
+from openerp import addons
-import netsvc
-from osv import osv, fields
-import tools
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
index f2447ce7b94..84a50eb22c8 100644
--- a/addons/fetchmail/res_config.py
+++ b/addons/fetchmail/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class fetchmail_config_settings(osv.osv_memory):
""" This wizard can be inherited in conjunction with 'res.config.settings', in order to
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e74ac4839f4..279f69dad71 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import time
import datetime
-import tools
-from osv.orm import except_orm
-from tools.translate import _
+from openerp import tools
+from openerp.osv.orm import except_orm
+from openerp.tools.translate import _
from dateutil.relativedelta import relativedelta
def str_to_datetime(strdate):
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index c860ec84374..46b1757a7b3 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_users(osv.osv):
_inherit = "res.users"
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index 7eb568075c3..f4464976aee 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.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 _
try:
import gdata.contacts.service
import gdata.contacts.client
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 462c8240810..21a340743ce 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -18,9 +18,9 @@
#
##############################################################################
from datetime import datetime
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from osv import osv, fields
-from tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
try:
import gdata.docs.data
import gdata.docs.client
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 1ed86ab58bb..02ac7f16fd9 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -22,8 +22,6 @@
import hr_department
import hr
-import report
-import wizard
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index ca165b7e8eb..faf22137991 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -19,10 +19,10 @@
#
##############################################################################
-import addons
+from openerp import addons
import logging
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
_logger = logging.getLogger(__name__)
class hr_employee_category(osv.osv):
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index e73046fb2b6..185e9f73a45 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class hr_department(osv.osv):
def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 299c5ca68fe..147c4e4d5b9 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_config_settings(osv.osv_memory):
_name = 'hr.config.settings'
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index a2ee3650a2f..75c343bbcb3 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_action_reason(osv.osv):
_name = "hr.action.reason"
diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 6d41869ff23..69ce9511ac2 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -19,19 +19,16 @@
#
##############################################################################
-import time
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
-import netsvc
-import pooler
+import time
-from report.interface import report_rml
-from report.interface import toxml
-
-from report import report_sxw
-from tools import ustr
-from tools.translate import _
-from tools import to_xml
+from openerp import netsvc, pooler
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
+from openerp.tools import to_xml, ustr
+from openerp.tools.translate import _
one_day = relativedelta(days=1)
month2name = [0, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 29586ba5524..411a1139def 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -19,10 +19,11 @@
#
##############################################################################
-import time
-from report import report_sxw
-import pooler
import datetime
+import time
+
+from openerp import pooler
+from openerp.report import report_sxw
class attendance_print(report_sxw.rml_parse):
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 5df1bae4dba..321bb6bacc9 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -20,16 +20,14 @@
##############################################################################
-import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
+import time
-import pooler
-from report.interface import report_rml
-from report.interface import toxml
-from report import report_sxw
-from tools.translate import _
-import tools
+from openerp import pooler, tools
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml, toxml
+from openerp.tools.translate import _
one_week = relativedelta(days=7)
num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
index 61e2f784a5a..58c6ed4124f 100644
--- a/addons/hr_attendance/res_config.py
+++ b/addons/hr_attendance/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_attendance_config_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 03e1db5dc3a..6994bc5f906 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import osv, fields
class hr_attendance_bymonth(osv.osv_memory):
_name = 'hr.attendance.month'
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 420773eaf13..7fcfc175f0e 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -18,10 +18,11 @@
# along with this program. If not, see .
#
##############################################################################
+
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_attendance_byweek(osv.osv_memory):
_name = 'hr.attendance.week'
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index d489e699d89..066f4a56e07 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_attendance_error(osv.osv_memory):
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 90f42d8487a..faf8b015a48 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_employee(osv.osv):
_name = "hr.employee"
diff --git a/addons/hr_evaluation/__init__.py b/addons/hr_evaluation/__init__.py
index 0f403959cd9..af89630a94b 100644
--- a/addons/hr_evaluation/__init__.py
+++ b/addons/hr_evaluation/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import hr_evaluation
-import wizard
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index eece0c7497e..d0e6cbbebbd 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -19,12 +19,13 @@
#
##############################################################################
-import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from dateutil import parser
-from osv import fields, osv
-from tools.translate import _
+import time
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_evaluation_plan(osv.osv):
_name = "hr_evaluation.plan"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index bc2e50629c3..62a5e4abd89 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields, osv
class hr_evaluation_report(osv.osv):
_name = "hr.evaluation.report"
diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py
index 55a87f95400..8a5a967e604 100644
--- a/addons/hr_expense/__init__.py
+++ b/addons/hr_expense/__init__.py
@@ -21,7 +21,6 @@
import hr_expense
import report
-import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index ccb8af68e21..ea20ce3cf4f 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -21,10 +21,11 @@
import time
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
-import netsvc
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+import openerp.addons.decimal_precision as dp
def _employee_get(obj, cr, uid, context=None):
if context is None:
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index 7078c23d244..a6898204741 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import time
-from report import report_sxw
import datetime
+import time
+
+from openerp.report import report_sxw
class expense(report_sxw.rml_parse):
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 72bf710ec4f..6f18c668413 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-from decimal_precision import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields, osv
+
+from openerp.addons.decimal_precision import decimal_precision as dp
class hr_expense_report(osv.osv):
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 09936d07767..2e05abfa745 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -26,10 +26,10 @@ from itertools import groupby
from operator import itemgetter
import math
-import netsvc
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import netsvc
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_holidays_status(osv.osv):
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index cadd3a22ce6..fcf000cab70 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -22,16 +22,16 @@
import datetime
import time
-from osv import fields, osv
-from report.interface import report_rml
+from openerp.osv import fields, osv
+from openerp.report.interface import report_rml
from report.interface import toxml
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
-from tools import ustr
-from tools.translate import _
-from tools import to_xml
+from openerp.report import report_sxw
+from openerp.tools import ustr
+from openerp.tools.translate import _
+from openerp.tools import to_xml
def lengthmonth(year, month):
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index f7b813f9cc5..394575d765d 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class hr_holidays_remaining_leaves_user(osv.osv):
_name = "hr.holidays.remaining.leaves.user"
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index efd64c88500..ef1cb8f9e6f 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -21,8 +21,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_holidays_summary_dept(osv.osv_memory):
_name = 'hr.holidays.summary.dept'
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 2622ffa7493..1897d82c882 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_holidays_summary_employee(osv.osv_memory):
_name = 'hr.holidays.summary.employee'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c0e4bc39321..7804260ab7b 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -26,13 +26,13 @@ from datetime import datetime
from datetime import timedelta
from dateutil import relativedelta
-import netsvc
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
import decimal_precision as dp
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
class hr_payroll_structure(osv.osv):
"""
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index c0285f3de50..39c913adada 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -26,7 +26,7 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from report import report_sxw
+from openerp.report import report_sxw
class contribution_register_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index df4c729b298..8ed91bd9a82 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -22,8 +22,8 @@
#
##############################################################################
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payslip_report(report_sxw.rml_parse):
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 5a110cbfdcd..1251fedd826 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -22,8 +22,8 @@
#
##############################################################################
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payslip_details_report(report_sxw.rml_parse):
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index 72f8b56d5da..22e7f95ccaa 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class human_resources_configuration(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
index 14860cdc753..716a5060f14 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
@@ -23,7 +23,7 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from osv import osv, fields
+from openerp.osv import fields, osv
class payslip_lines_contribution_register(osv.osv_memory):
_name = 'payslip.lines.contribution.register'
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 1c9be1f9354..aa36d223406 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -23,8 +23,8 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_payslip_employees(osv.osv_memory):
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 94df47f6e44..b15000dd12f 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -20,12 +20,12 @@
#
##############################################################################
import time
-import netsvc
+from openerp import netsvc
from datetime import date, datetime, timedelta
-from osv import fields, osv
-from tools import config
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import config
+from openerp.tools.translate import _
class hr_payslip(osv.osv):
'''
diff --git a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index af41b7b3b51..76d197a17ec 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class hr_payslip_employees(osv.osv_memory):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index de1539da55a..449be3079e5 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -20,13 +20,13 @@
##############################################################################
import time
-import tools
+from openerp import tools
from base_status.base_stage import base_stage
from datetime import datetime
-from osv import fields, osv
-from tools.translate import _
-from tools import html2plaintext
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
AVAILABLE_STATES = [
('draft', 'New'),
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index d3faa3f37be..08ded0f8351 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
from .. import hr_recruitment
from decimal_precision import decimal_precision as dp
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index d80b0b71727..ac53bf74ff3 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_applicant_settings(osv.osv_memory):
_name = 'hr.config.settings'
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index f1fa6446588..82dd534d81b 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -19,8 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_recruitment_partner_create(osv.osv_memory):
_name = 'hr.recruitment.partner.create'
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index 0b57082c019..58fb706a09e 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -19,8 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hired_employee(osv.osv_memory):
_name = 'hired.employee'
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 9e5337492d9..80ae99286c7 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -21,9 +21,9 @@
import time
-from osv import fields
-from osv import osv
-from tools.translate import _
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp.tools.translate import _
class hr_employee(osv.osv):
_name = "hr.employee"
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 8d2a7d35678..f58accc2639 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -21,14 +21,14 @@
import datetime
-from report.interface import report_rml
+from openerp.report.interface import report_rml
from report.interface import toxml
-from tools.translate import _
+from openerp.tools.translate import _
import time
-import pooler
-from report import report_sxw
-from tools import ustr
-from tools import to_xml
+from openerp import pooler
+from openerp.report import report_sxw
+from openerp.tools import ustr
+from openerp.tools import to_xml
def lengthmonth(year, month):
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 4c619721329..5580355df8b 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -20,13 +20,13 @@
##############################################################################
import datetime
-from report.interface import report_rml
+from openerp.report.interface import report_rml
from report.interface import toxml
import time
-import pooler
-from tools.translate import _
-from report import report_sxw
-from tools import ustr
+from openerp import pooler
+from openerp.tools.translate import _
+from openerp.report import report_sxw
+from openerp.tools import ustr
def lengthmonth(year, month):
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 96ce23fb855..1523756aae0 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -20,8 +20,8 @@
##############################################################################
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class analytical_timesheet_employee(osv.osv_memory):
_name = 'hr.analytical.timesheet.employee'
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 2a91bb607a4..8d9f0b01f68 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -21,7 +21,7 @@
import datetime
-from osv import osv, fields
+from openerp.osv import fields, osv
class analytical_timesheet_employees(osv.osv_memory):
_name = 'hr.analytical.timesheet.users'
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 3991696b331..53d01241c22 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_so_project(osv.osv_memory):
_name = 'hr.sign.out.project'
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 161ac761aec..a3eee954e0f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_invoice_factor(osv.osv):
_name = "hr_timesheet_invoice.factor"
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index fc44089bf9e..57fd06b0c34 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
class account_analytic_profit(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 7af9603ebd8..1c1cdef2c25 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
from tools.sql import drop_view_if_exists
class report_timesheet_line(osv.osv):
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index 469e13e71b6..846e065efaf 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
from decimal_precision import decimal_precision as dp
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 0ab5b434a91..6c6523f93f9 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -20,8 +20,8 @@
##############################################################################
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_analytic_profit(osv.osv_memory):
_name = 'hr.timesheet.analytic.profit'
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 2671cd1ab90..1977d6cccc5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
#
# Create an final invoice based on selected timesheet lines
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 0a8fd36f469..6aa8b0f9d8d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_invoice_create(osv.osv_memory):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index bf6790c6be3..13b1fcd0adc 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class hr_timesheet_sheet(osv.osv):
_name = "hr_timesheet_sheet.sheet"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 1fdcac9f7c6..81bc1df39d5 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
from decimal_precision import decimal_precision as dp
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index e276980ddf7..31255a3a6b2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class timesheet_report(osv.osv):
_name = "timesheet.report"
diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py
index bb4e098e1b3..e767b4da8fa 100644
--- a/addons/hr_timesheet_sheet/res_config.py
+++ b/addons/hr_timesheet_sheet/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_timesheet_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 652d5139288..c2d5167c179 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_current_open(osv.osv_memory):
_name = 'hr.timesheet.current.open'
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 6ba34554a61..2bf8f390776 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp.tools.translate import _
import time
VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 012bd670ee3..fddbb5ebdc3 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class knowledge_config_settings(osv.osv_memory):
_name = 'knowledge.config.settings'
diff --git a/addons/l10n_at/account_wizard.py b/addons/l10n_at/account_wizard.py
index a3f87456cfc..278837322ac 100644
--- a/addons/l10n_at/account_wizard.py
+++ b/addons/l10n_at/account_wizard.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import osv
-import addons
+from openerp import tools
+from openerp.osv import osv
+from openerp import addons
class AccountWizard_cd(osv.osv_memory):
_inherit='wizard.multi.charts.accounts'
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 092d907e4ab..d89d427ef6b 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -26,8 +26,8 @@
##############################################################################
import base64
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class l10n_be_vat_declaration(osv.osv_memory):
""" Vat Declaration """
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 53948945e04..7aa612d95ff 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -26,9 +26,9 @@
import time
import base64
-from tools.translate import _
-from osv import fields, osv
-from report import report_sxw
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp.report import report_sxw
class vat_listing_clients(osv.osv_memory):
_name = 'vat.listing.clients'
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index aa4dac11072..c103e38979e 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -25,9 +25,9 @@
import time
import base64
-from osv import osv, fields
-from tools.translate import _
-from report import report_sxw
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.report import report_sxw
class partner_vat_intra(osv.osv_memory):
"""
diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
index 1dab4ab1964..584cf7bb8d2 100644
--- a/addons/l10n_be_coda/l10n_be_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
@@ -20,9 +20,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class coda_bank_account(osv.osv):
_name= 'coda.bank.account'
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 46c545f0f48..97b48912939 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -22,8 +22,8 @@
import time
import base64
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
import logging
import re
from traceback import format_exception
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
index e07e8cc5682..79909cf79af 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
@@ -19,8 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import decimal_precision as dp
+from openerp.osv import fields, osv
+
+import openerp.addons.decimal_precision as dp
class hr_contract_be(osv.osv):
_inherit = 'hr.contract'
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 188a8d896fd..a23dabd7c51 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -21,8 +21,8 @@
##############################################################################
import re, time, random
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 8951be5dfa2..9e0eec10713 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -21,9 +21,9 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
-from tools.translate import _
+from openerp.tools.translate import _
class res_partner(osv.osv):
""" add field to indicate default 'Communication Type' on customer invoices """
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 64d3c2cda79..e1a7ab08dbc 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -22,13 +22,13 @@ from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
from operator import itemgetter
-import netsvc
-import pooler
-from osv import fields, osv
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv
import decimal_precision as dp
from tools.misc import currency
-from tools.translate import _
-from tools import config
+from openerp.tools.translate import _
+from openerp.tools import config
from openerp import SUPERUSER_ID
class account_tax_code_template(osv.osv):
diff --git a/addons/l10n_br/l10n_br.py b/addons/l10n_br/l10n_br.py
index f35ced7ea09..aac17e1d984 100644
--- a/addons/l10n_br/l10n_br.py
+++ b/addons/l10n_br/l10n_br.py
@@ -17,7 +17,7 @@
#along with this program. If not, see . #
#################################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_br_account_cst_template(osv.osv):
_name = 'l10n_br_account.cst.template'
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 306207c612d..9924b4b4b0b 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import tools
-from osv import osv
-import addons
+from openerp import tools
+from openerp.osv import osv
+from openerp import addons
import os
class WizardMultiChartsAccounts(osv.osv_memory):
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index 4e4c0e0aa8c..5a0bc44ee27 100644
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
import re
class Bank(osv.osv):
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index a90bb6a0389..bc4da0be98e 100644
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_company(osv.osv):
"""override company in order to add bvr vertical and
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 3a65e9a0d2b..d8e9cb78f02 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime
-from osv import fields, osv
-from tools import mod10r
+from openerp.osv import fields, osv
+from openerp.tools import mod10r
class account_invoice(osv.osv):
"""Inherit account.invoice in order to add bvr
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index aba9ea7b204..7efa5cc9216 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/l10n_ch/payment.py b/addons/l10n_ch/payment.py
index a681daf569d..cb0430a7b25 100644
--- a/addons/l10n_ch/payment.py
+++ b/addons/l10n_ch/payment.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class payment_order(osv.osv):
_inherit = 'payment.order'
diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 6b6a84e0cf4..f11513b756d 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -29,20 +29,20 @@ from mako.lookup import TemplateLookup
from mako import exceptions
-from report import report_sxw
+from openerp.report import report_sxw
from report_webkit import webkit_report
from report_webkit import report_helper
-from osv import osv
+from openerp.osv import osv
from osv.osv import except_osv
-from tools import mod10r
-from tools.translate import _
+from openerp.tools import mod10r
+from openerp.tools.translate import _
from tools.config import config
-import wizard
-import addons
-import pooler
+from openerp import wizard
+from openerp import addons
+from openerp import pooler
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 38ba1e2a7d9..cc20a0a8834 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -22,10 +22,10 @@ import base64
import time
import re
-from tools.translate import _
-from osv import osv, fields
-from tools import mod10r
-import pooler
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import mod10r
+from openerp import pooler
def _reconstruct_invoice_ref(cursor, user, reference, context=None):
###
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index f2d8f14b772..1696e639383 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime
import base64
-from osv import osv, fields
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
import unicode2ascii
import re
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index e1240ddd83a..c995b44a614 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_fr_report(osv.osv):
_name = 'l10n.fr.report'
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 4a5aaa24823..39a18bc7ca4 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -28,7 +28,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class base_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index fafacd8f6ea..a7947434da0 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -27,7 +27,7 @@
##############################################################################
import base_report
-from report import report_sxw
+from openerp.report import report_sxw
class bilan(base_report.base_report):
def __init__(self, cr, uid, name, context):
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index e91f9fc839e..9a1809fd7cc 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -27,7 +27,7 @@
##############################################################################
import base_report
-from report import report_sxw
+from openerp.report import report_sxw
class cdr(base_report.base_report):
def __init__(self, cr, uid, name, context):
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index adeab4f0ab4..90e97389eed 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -26,7 +26,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_bilan_report(osv.osv_memory):
_name = 'account.bilan.report'
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index f3833b372c4..eff52189bc9 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -26,7 +26,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_cdr_report(osv.osv_memory):
_name = 'account.cdr.report'
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
index 8b08bc2385d..b8b9e9d15db 100755
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import decimal_precision as dp
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
index e941be0079e..daa7c6fd6ac 100755
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
@@ -22,7 +22,7 @@
#
##############################################################################
-from report import report_sxw
+from openerp.report import report_sxw
class fiche_paye_parser(report_sxw.rml_parse):
diff --git a/addons/l10n_fr_rib/bank.py b/addons/l10n_fr_rib/bank.py
index b5d284ac45d..8ad86932a34 100644
--- a/addons/l10n_fr_rib/bank.py
+++ b/addons/l10n_fr_rib/bank.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import netsvc
-from osv import fields, osv
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class res_partner_bank(osv.osv):
"""Add fields and behavior for French RIB"""
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b7c3926d727..be16ba7df3b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -24,9 +24,9 @@ from datetime import datetime
from dateutil.relativedelta import relativedelta
from calendar import isleap
-from tools.translate import _
-from osv import fields, osv
-import netsvc
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
import decimal_precision as dp
DATETIME_FORMAT = "%Y-%m-%d"
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index a264368be94..59456b13b55 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class payment_advice_report(osv.osv):
_name = "payment.advice.report"
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
index a78d9850667..b44f123547b 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report.py
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class payslip_report(osv.osv):
_name = "payslip.report"
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 54b0daa7749..f4b282dd89c 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -22,7 +22,7 @@
import datetime
import time
-from report import report_sxw
+from openerp.report import report_sxw
class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 576fd302f6f..220bcdb5552 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -21,7 +21,7 @@
import time
import datetime
-from report import report_sxw
+from openerp.report import report_sxw
class employees_yearly_salary_report(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index d4eeaf3d218..eaece823f6d 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -24,8 +24,8 @@
import time
from datetime import datetime
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payroll_advice_report(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index 2732d5d09ae..462bb374287 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from report import report_sxw
+from openerp.report import report_sxw
from hr_payroll import report
class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 25cc615a1df..62d332ea5b8 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_salary_employee_bymonth(osv.osv_memory):
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
index 16bfd63bdc9..ed2a02e8d42 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class yearly_salary_detail(osv.osv_memory):
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
index e90cf0527d2..94f150e41d7 100644
--- a/addons/l10n_lu/wizard/pdf_ext.py
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -34,7 +34,7 @@ with flatten, everything is turned into text.
"""
import os
-import tools
+from openerp import tools
HEAD="""%FDF-1.2
%\xE2\xE3\xCF\xD3
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 5151378d2f7..b8ffc642977 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -5,13 +5,13 @@
#Tranquil IT Systems
from __future__ import with_statement
-from osv import osv, fields
-import pooler
-import tools
-from tools.translate import _
-from report.render import render
-from report.interface import report_int
-import addons
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.report.render import render
+from openerp.report.interface import report_int
+from openerp import addons
import tempfile
import os
diff --git a/addons/l10n_ma/__init__.py b/addons/l10n_ma/__init__.py
index 070b09bdf33..895f0216346 100644
--- a/addons/l10n_ma/__init__.py
+++ b/addons/l10n_ma/__init__.py
@@ -19,7 +19,5 @@
#
##############################################################################
import l10n_ma
-import report
-import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/l10n_ma.py b/addons/l10n_ma/l10n_ma.py
index a8e0dd42687..6321516cf0f 100644
--- a/addons/l10n_ma/l10n_ma.py
+++ b/addons/l10n_ma/l10n_ma.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_ma_report(osv.osv):
_name = 'l10n.ma.report'
diff --git a/addons/l10n_multilang/account.py b/addons/l10n_multilang/account.py
index c04054d1b1c..4cb0e28b672 100644
--- a/addons/l10n_multilang/account.py
+++ b/addons/l10n_multilang/account.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
#in this file, we mostly add the tag translate=True on existing fields that we now want to be translated
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index c4c6be74e4b..9596b292ff3 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import os
-from tools.translate import _
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 009aa76b62f..098a92251f4 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -21,7 +21,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_name = "res.partner"
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 0d224ef3a8e..0b1fd867d2f 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -21,11 +21,11 @@
from xml.sax.saxutils import escape
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
from datetime import datetime
from lxml import etree
-import tools
-from tools.translate import _
+from openerp import tools
+from openerp.tools.translate import _
class lunch_order(osv.Model):
"""
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index abd5b2726a3..064fe8bc719 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
+from openerp.report import report_sxw
+from openerp.osv import osv
class order(report_sxw.rml_parse):
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 3a0875c1cd1..3a439a4a4dd 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class report_lunch_order(osv.osv):
_name = "report.lunch.order.line"
diff --git a/addons/lunch/tests/test_lunch.py b/addons/lunch/tests/test_lunch.py
index 128e4796611..49e936848fe 100644
--- a/addons/lunch/tests/test_lunch.py
+++ b/addons/lunch/tests/test_lunch.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import tools
+from openerp import tools
from openerp.tests import common
class Test_Lunch(common.TransactionCase):
diff --git a/addons/lunch/wizard/lunch_cancel.py b/addons/lunch/wizard/lunch_cancel.py
index 648ab4e2396..5da41175a56 100644
--- a/addons/lunch/wizard/lunch_cancel.py
+++ b/addons/lunch/wizard/lunch_cancel.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_cancel(osv.Model):
""" lunch cancel """
diff --git a/addons/lunch/wizard/lunch_order.py b/addons/lunch/wizard/lunch_order.py
index 767497bcc4b..aa595323c2e 100644
--- a/addons/lunch/wizard/lunch_order.py
+++ b/addons/lunch/wizard/lunch_order.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_order_order(osv.TransientModel):
""" lunch order meal """
diff --git a/addons/lunch/wizard/lunch_validation.py b/addons/lunch/wizard/lunch_validation.py
index f4b4b30747d..e1e888ee399 100644
--- a/addons/lunch/wizard/lunch_validation.py
+++ b/addons/lunch/wizard/lunch_validation.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_validation(osv.Model):
""" lunch validation """
diff --git a/addons/mail/mail_favorite.py b/addons/mail/mail_favorite.py
index 4fe5fbdb557..3ad16db7c53 100644
--- a/addons/mail/mail_favorite.py
+++ b/addons/mail/mail_favorite.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class mail_favorite(osv.Model):
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 8d3876ec91f..977bc82c86b 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -20,9 +20,9 @@
##############################################################################
from openerp import SUPERUSER_ID
-from osv import osv
-from osv import fields
-import tools
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp import tools
class mail_followers(osv.Model):
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 30a31e2b701..8764d085029 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -21,8 +21,8 @@
import openerp
import openerp.tools as tools
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
from openerp import SUPERUSER_ID
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index a29ee2519d5..c4bf5fd0c7a 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -20,8 +20,8 @@
##############################################################################
from openerp import SUPERUSER_ID
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
class ir_ui_menu(osv.osv):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 741184ef7a3..37185ef7fb0 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -21,11 +21,11 @@
import base64
import logging
-import tools
+from openerp import tools
from openerp import SUPERUSER_ID
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index aec106f766b..9fdd338e313 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -20,7 +20,7 @@
##############################################################################
import logging
-import tools
+from openerp import tools
from email.header import decode_header
from openerp import SUPERUSER_ID
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index e37e20259f8..8a9bac86f0c 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
class mail_message_subtype(osv.osv):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 30954be4ed8..b6f5de7a807 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -25,14 +25,14 @@ import email
import logging
import pytz
import time
-import tools
+from openerp import tools
import xmlrpclib
from email.message import Message
from mail_message import decode
from openerp import SUPERUSER_ID
-from osv import osv, fields
-from tools.safe_eval import safe_eval as eval
+from openerp.osv import fields, osv
+from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 1e439fe0aeb..bde46f8a90d 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class mail_vote(osv.Model):
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 060adc291de..cf9a2272a98 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class res_partner_mail(osv.Model):
""" Update partner to add a field about notification preferences """
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 20c0715c148..c6121dd3225 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from openerp import SUPERUSER_ID
-from tools.translate import _
+from openerp.tools.translate import _
class res_users(osv.Model):
""" Update of res.users class
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index bc6df813ef7..22508228958 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import tools
+from openerp import tools
from openerp.addons.mail.tests import test_mail_mockup
from openerp.tools.mail import html_sanitize
diff --git a/addons/mail/update.py b/addons/mail/update.py
index f571a59440d..fa360dd3d8c 100644
--- a/addons/mail/update.py
+++ b/addons/mail/update.py
@@ -5,13 +5,13 @@ import sys
import urllib
import urllib2
-import pooler
+from openerp import pooler
import release
-from osv import osv, fields
-from tools.translate import _
-from tools.safe_eval import safe_eval
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
from tools.config import config
-from tools import misc
+from openerp.tools import misc
_logger = logging.getLogger(__name__)
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 50ecf9450da..4d182d0eea5 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp.tools.translate import _
class invite_wizard(osv.osv_memory):
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 58066c6f2c2..a711aedf6fc 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -21,12 +21,12 @@
import base64
import re
-import tools
+from openerp import tools
-from osv import osv
-from osv import fields
-from tools.safe_eval import safe_eval as eval
-from tools.translate import _
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
# main mako-like expression pattern
EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py
index 7cedb65a373..3c161c4d0d6 100644
--- a/addons/marketing/res_config.py
+++ b/addons/marketing/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class marketing_config_settings(osv.osv_memory):
_name = 'marketing.config.settings'
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index bfabd2002bd..5086b4e8d8a 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -27,13 +27,13 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
from traceback import format_exception
from sys import exc_info
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
import re
from decimal_precision import decimal_precision as dp
-from osv import fields, osv
-import netsvc
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
+from openerp.tools.translate import _
_intervalTypes = {
'hours': lambda interval: relativedelta(hours=interval),
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index d469be9c25e..c8e2905b597 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
from decimal_precision import decimal_precision as dp
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index 8ae1ab8645a..c151c2f4050 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 4ffd067d73e..5fed59dac59 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -21,9 +21,9 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
STATE = [
('none', 'Non Member'),
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 273ec0db74f..6cc6b792af1 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
import decimal_precision as dp
STATE = [
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 4ef16b99d82..6559f477b47 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import decimal_precision as dp
class membership_invoice(osv.osv_memory):
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 22acf4fc5dd..af8a21f4934 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 6a708b7cc64..541e49e90e0 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -20,13 +20,13 @@
##############################################################################
from datetime import datetime
-from osv import osv, fields
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
-from tools.translate import _
-import netsvc
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
+from openerp.tools.translate import _
+from openerp import netsvc
import time
-import tools
+from openerp import tools
#----------------------------------------------------------
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index e2ba45ee230..97d27d0d08d 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -21,10 +21,10 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import fields
-from osv import osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp import netsvc
class procurement_order(osv.osv):
_inherit = 'procurement.order'
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 1fa0f2c8a97..f5e29a1d103 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.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 product_product(osv.osv):
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index 458a0c19649..ae26bc4f8cd 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class bom_structure(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index b98c5d3e40f..7dff886a4ba 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class report_workcenter_load(osv.osv):
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 1c631806dde..eb3f5663677 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index b1e04749ab2..2e37011e2bc 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -20,12 +20,12 @@
##############################################################################
import time
-import pooler
-from report.interface import report_rml
-from tools import to_xml
-from report import report_sxw
+from openerp import pooler
+from openerp.report.interface import report_rml
+from openerp.tools import to_xml
+from openerp.report import report_sxw
from datetime import datetime
-from tools.translate import _
+from openerp.tools.translate import _
class report_custom(report_rml):
def create_xml(self, cr, uid, ids, datas, context=None):
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index fa447f91bc5..ffce2da9d31 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -19,13 +19,13 @@
#
##############################################################################
-from report.render import render
-from report.interface import report_int
+from openerp.report.render import render
+from openerp.report.interface import report_int
import time
from datetime import date, datetime, timedelta
from dateutil.relativedelta import relativedelta
-from report.misc import choice_colors
+from openerp.report.misc import choice_colors
import StringIO
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index ec3deb524a3..52c56acf3d7 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class mrp_config_settings(osv.osv_memory):
_name = 'mrp.config.settings'
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index fdfe09f35b4..ae7edf54750 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields
-from osv import osv
-import netsvc
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp import netsvc
class StockMove(osv.osv):
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 9be34b6bd1e..15d82a9d769 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.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 _
import decimal_precision as dp
class change_production_qty(osv.osv_memory):
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 2a685e8c833..08506ccf0e2 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class mrp_price(osv.osv_memory):
_name = 'mrp.product_price'
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index d014b28b186..f827388e669 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import decimal_precision as dp
class mrp_product_produce(osv.osv_memory):
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index 3f4fd86633a..265c6ddcea0 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class mrp_workcenter_load(osv.osv_memory):
_name = 'mrp.workcenter.load'
diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 9caf626834a..7b27a3ffcfd 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields
-from osv import osv
+from openerp.osv import fields
+from openerp.osv import osv
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class mrp_subproduct(osv.osv):
_name = 'mrp.subproduct'
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 4bca93d260f..1b82ec09b01 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import fields
-from osv import osv
-import netsvc
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp import netsvc
import time
from datetime import datetime
-from tools.translate import _
+from openerp.tools.translate import _
#----------------------------------------------------------
# Work Centers
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
index ab487b7c70a..ee9b7a64a40 100644
--- a/addons/mrp_operations/report/mrp_code_barcode.py
+++ b/addons/mrp_operations/report/mrp_code_barcode.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class code_barcode(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
index b422ecda340..746ed6d71c7 100644
--- a/addons/mrp_operations/report/mrp_wc_barcode.py
+++ b/addons/mrp_operations/report/mrp_wc_barcode.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class workcenter_code(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py
index c2e0733d7f2..4358f2a4ddf 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis.py
+++ b/addons/mrp_operations/report/mrp_workorder_analysis.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
import decimal_precision as dp
class mrp_workorder(osv.osv):
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 905a1b5642f..78c3491a27e 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -19,11 +19,11 @@
#
##############################################################################
-from osv import fields,osv
-import netsvc
+from openerp.osv import fields,osv
+from openerp import netsvc
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from tools.translate import _
+from openerp.tools.translate import _
import decimal_precision as dp
class mrp_repair(osv.osv):
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index d6edc1f01e4..818a55f0070 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index af8b2278c63..12b85efd202 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
class repair_cancel(osv.osv_memory):
_name = 'mrp.repair.cancel'
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 4f0ec8f4b32..3579af7cbe6 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import netsvc
-from osv import osv, fields
+from openerp import netsvc
+from openerp.osv import fields, osv
class make_invoice(osv.osv_memory):
_name = 'mrp.repair.make_invoice'
diff --git a/addons/note_pad/note_pad.py b/addons/note_pad/note_pad.py
index d0c18a9f986..24157fa0c11 100644
--- a/addons/note_pad/note_pad.py
+++ b/addons/note_pad/note_pad.py
@@ -20,7 +20,7 @@
##############################################################################
from openerp.osv import osv, fields
-from tools.translate import _
+from openerp.tools.translate import _
class note_pad_note(osv.osv):
""" memo pad """
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 8f9f79a78e0..12fa8254d00 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
-from osv import fields, osv
+from openerp.osv import fields, osv
import random
import re
import string
import urllib2
import logging
-from tools.translate import _
+from openerp.tools.translate import _
from openerp.tools import html2plaintext
from py_etherpad import EtherpadLiteClient
diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
index fcf8bc97e91..95f1d9c1118 100644
--- a/addons/pad/res_company.py
+++ b/addons/pad/res_company.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from osv import fields, osv
+from openerp.osv import fields, osv
class company_pad(osv.osv):
_inherit = 'res.company'
diff --git a/addons/pad_project/project_task.py b/addons/pad_project/project_task.py
index 6ebebae97fd..eceda877a8b 100644
--- a/addons/pad_project/project_task.py
+++ b/addons/pad_project/project_task.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class task(osv.osv):
_name = "project.task"
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 95fe80f3b29..0664af1c92e 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -4,7 +4,7 @@ Created on 18 oct. 2011
@author: openerp
'''
-from osv import osv, fields
+from openerp.osv import fields, osv
class plugin_handler(osv.osv_memory):
_name = 'plugin.handler'
diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 4fc1f391fab..3210f2505ca 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields
-from osv import osv
-import addons
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp import addons
import base64
class outlook_installer(osv.osv_memory):
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 923611b97a9..71d2aab1022 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -19,8 +19,7 @@
#
##############################################################################
-from osv import fields
-from osv import osv
+from openerp.osv import fields, osv
class plugin_thunderbird_installer(osv.osv_memory):
_name = 'plugin_thunderbird.installer'
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 06fe1d4a1f8..4f88f8e3650 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_journal(osv.osv):
_inherit = 'account.journal'
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 5ac6d6a29e0..970eb1fbed7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -19,22 +19,20 @@
#
##############################################################################
-import pdb
-import openerp
-import addons
-import openerp.addons.product.product
-
-import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import logging
-
-import netsvc
-from osv import fields, osv
-import tools
-from tools.translate import _
from decimal import Decimal
-import decimal_precision as dp
+import logging
+import pdb
+import time
+
+import openerp
+from openerp import netsvc, tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+import openerp.addons.decimal_precision as dp
+import openerp.addons.product.product
_logger = logging.getLogger(__name__)
diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index c1fc73a35d7..c9de91dbbbf 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class account_statement(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index dc3b432728f..8559d2571d6 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
#TOFIX: sql injection problem: SQL Request must be pass from sql injection...
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 293eeb722a3..3b8df068a34 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_details(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a917ce99c06..a4facaabcac 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_details_summary(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 0677ac0e8d9..60f4f233729 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -21,9 +21,9 @@
import time
-from report import report_sxw
-from osv import osv
-from tools.translate import _
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp.tools.translate import _
class pos_invoice(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 6c48d9e9733..f20ccfd1ec2 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_lines(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 914bef06bbf..62250f11e17 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class pos_order_report(osv.osv):
_name = "report.pos.order"
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index 1fed98a4852..e52694c9d01 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_payment_report(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index b347c86da2a..d3928df4a84 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_payment_report_user(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 58044c28c77..6272de95db7 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
def titlize(journal_name):
words = journal_name.split()
diff --git a/addons/point_of_sale/report/pos_report.py b/addons/point_of_sale/report/pos_report.py
index 1ecf80ea519..f0dbcfcad88 100644
--- a/addons/point_of_sale/report/pos_report.py
+++ b/addons/point_of_sale/report/pos_report.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import time
-import netsvc
-import tools
+from openerp import netsvc
+from openerp import tools
class report_transaction_pos(osv.osv):
_name = "report.transaction.pos"
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index aa43592363f..1da46cc3a22 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_sales_user(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 35bc61efea8..521fbd0adda 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_sales_user_today(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 032a25043e8..9dfc89a618d 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class pos_user_product(report_sxw.rml_parse):
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
index 61462b8e0de..81a0f6083be 100644
--- a/addons/point_of_sale/res_partner.py
+++ b/addons/point_of_sale/res_partner.py
@@ -1,7 +1,9 @@
-
#!/usr/bin/env python
-from osv import osv, fields
+
import math
+
+from openerp.osv import osv, fields
+
import openerp.addons.product.product
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index 2573e39040a..05e49a5545d 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -1,6 +1,9 @@
#!/usr/bin/env python
-from osv import osv, fields
+
import math
+
+from openerp.osv import osv, fields
+
import openerp.addons.product.product
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 2d1c1a8e0cf..14e653b915c 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -1,8 +1,9 @@
#!/usr/bin/env python
-from tools.translate import _
-from osv import osv, fields
-from account.wizard.pos_box import CashBox
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
+from openerp.addons.account.wizard.pos_box import CashBox
class PosBox(CashBox):
_register = False
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 2920be50130..ff6af8e1f62 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
def get_journal(self, cr, uid, context=None):
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index e8366b019a4..6b0b9ee4755 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -23,8 +23,8 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import pos_box_entries
class pos_box_out(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index fc244c1cb00..4dec36685f0 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import netsvc
-from osv import osv
+from openerp import netsvc
+from openerp.osv import osv
class pos_confirm(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 22a1cce22d6..3f06dc57a46 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import osv, fields
class pos_details(osv.osv_memory):
_name = 'pos.details'
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index aadd85b48eb..d2703b21ad7 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import osv, fields
class pos_discount(osv.osv_memory):
_name = 'pos.discount'
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 2219f711b93..750a5519865 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class pos_open_statement(osv.osv_memory):
_name = 'pos.open.statement'
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 70b88f35e33..0a1684ca9ca 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -21,10 +21,11 @@
import time
-from osv import osv, fields
-from tools.translate import _
import pos_box_entries
-import netsvc
+
+from openerp import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class account_journal(osv.osv):
_inherit = 'account.journal'
diff --git a/addons/point_of_sale/wizard/pos_payment_report.py b/addons/point_of_sale/wizard/pos_payment_report.py
index e232466da0e..b28af5a3fff 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.py
+++ b/addons/point_of_sale/wizard/pos_payment_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class pos_payment_report(osv.osv_memory):
_name = 'pos.payment.report'
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index bdb2790dc87..06e224f39bc 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import osv, fields
class pos_payment_report_user(osv.osv_memory):
_name = 'pos.payment.report.user'
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index f4feee85504..2a62b74bb30 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class pos_receipt(osv.osv_memory):
_name = 'pos.receipt'
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 0e5d4e1fbb5..294cc531ae2 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import netsvc
-from osv import osv,fields
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
import time
class pos_return(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
index 22ffa66d2ad..f2f56d6e35c 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
class pos_sale_user(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.py b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
index 100154ac734..d3da6a9ad42 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_current_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class pos_sales_user_today_current_user(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index f48dd29b01b..dfc40c863b0 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import osv, fields
class pos_sales_user_today(osv.osv_memory):
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 7c88986169e..1aa4cb702c4 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
from openerp.addons.point_of_sale.point_of_sale import pos_session
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 13cde80f849..3e43e1a4424 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class portal(osv.osv):
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 48bb0f94858..c5688e5267f 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -22,9 +22,9 @@
import logging
import random
-from osv import osv, fields
-from tools.translate import _
-from tools import email_re
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import email_re
from openerp import SUPERUSER_ID
_logger = logging.getLogger(__name__)
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index 51e5e59eb0e..d983bf11ee1 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/portal_event/event.py b/addons/portal_event/event.py
index 6faf83eff36..45026da4eba 100644
--- a/addons/portal_event/event.py
+++ b/addons/portal_event/event.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class event_event(osv.osv):
_description = 'Portal event'
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index 94acea8c4aa..2986615eca5 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class crm_contact_us(osv.TransientModel):
""" Add employees list to the portal's contact page """
diff --git a/addons/portal_sale/account_invoice.py b/addons/portal_sale/account_invoice.py
index fa81b2049e0..0a35a80d06e 100644
--- a/addons/portal_sale/account_invoice.py
+++ b/addons/portal_sale/account_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class account_invoice(osv.osv):
_inherit = 'account.invoice'
diff --git a/addons/portal_sale/sale.py b/addons/portal_sale/sale.py
index aa8b6e57689..72e86db427a 100644
--- a/addons/portal_sale/sale.py
+++ b/addons/portal_sale/sale.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order(osv.osv):
_inherit = 'sale.order'
diff --git a/addons/process/__init__.py b/addons/process/__init__.py
index d2169ef4a36..30a81513bf7 100644
--- a/addons/process/__init__.py
+++ b/addons/process/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import process
-import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/process/process.py b/addons/process/process.py
index fa7596287a3..09405bfbe67 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import pooler
-import tools
-from osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
class Env(dict):
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 9d064c0e649..60e2db873e2 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index c166f79e524..5af75fb1e11 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
import time
import decimal_precision as dp
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 0c96bf1e689..3cb34d6bdff 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -21,13 +21,13 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import netsvc
-import pooler
-from osv import osv
-from osv import fields
-from tools.translate import _
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-import tools
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from openerp import tools
class procurement_order(osv.osv):
_inherit = 'procurement.order'
diff --git a/addons/procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
index 5cf8e16257a..34a146289f6 100644
--- a/addons/procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import netsvc
+from openerp import netsvc
-from osv import fields, osv
+from openerp.osv import fields, osv
class make_procurement(osv.osv_memory):
_name = 'make.procurement'
diff --git a/addons/procurement/wizard/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
index 7fa28adf5fe..56386bf234e 100644
--- a/addons/procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
@@ -20,7 +20,7 @@
##############################################################################
import threading
-from osv import osv, fields
+from openerp.osv import fields, osv
class procurement_compute(osv.osv_memory):
_name = 'procurement.order.compute'
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index 89c08bd4dfe..8f5f373772d 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -25,8 +25,8 @@
#
import threading
-import pooler
-from osv import fields,osv
+from openerp import pooler
+from openerp.osv import fields,osv
class procurement_compute(osv.osv_memory):
_name = 'procurement.orderpoint.compute'
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 2eed5381efc..9311ffcd11d 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -20,9 +20,9 @@
##############################################################################
import threading
-import pooler
+from openerp import pooler
-from osv import osv, fields
+from openerp.osv import fields, osv
class procurement_compute_all(osv.osv_memory):
_name = 'procurement.order.compute.all'
diff --git a/addons/product/partner.py b/addons/product/partner.py
index f779f3dcd4d..1d11e909346 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 60736323054..73707e39807 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -19,12 +19,14 @@
#
##############################################################################
-from osv import fields, osv
+import time
from _common import rounding
-import time
-from tools.translate import _
-import decimal_precision as dp
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+import openerp.addons.decimal_precision as dp
class price_type(osv.osv):
diff --git a/addons/product/product.py b/addons/product/product.py
index fb28f85b10f..38abae06f3c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -19,14 +19,16 @@
#
##############################################################################
-from osv import osv, fields
-import decimal_precision as dp
-
import math
-from _common import rounding
import re
-import tools
-from tools.translate import _
+
+from _common import rounding
+
+from openerp import tools
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
+import openerp.addons.decimal_precision as dp
def ean_checksum(eancode):
"""returns the checksum of an ean string of length 13, returns -1 if the string has the wrong length"""
diff --git a/addons/product/report/pricelist.py b/addons/product/report/pricelist.py
index a6360c8ef19..f8d41504c6c 100644
--- a/addons/product/report/pricelist.py
+++ b/addons/product/report/pricelist.py
@@ -20,10 +20,10 @@
##############################################################################
import datetime
-from report.interface import report_rml
+from openerp.report.interface import report_rml
from report.interface import toxml
-import pooler
-from osv import osv
+from openerp import pooler
+from openerp.osv import osv
import datetime
class report_custom(report_rml):
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 1f72dcd04b2..2ee40e6e044 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -20,10 +20,11 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
-from tools.translate import _
+
+from openerp import pooler
+from openerp.osv import osv
+from openerp.report import report_sxw
+from openerp.tools.translate import _
class product_pricelist(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index bf5f4674b27..8989e97d656 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class product_price_list(osv.osv_memory):
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index e4ed28db4e6..e939e594437 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -19,8 +19,8 @@
##############################################################################
import datetime
-from osv import fields, osv
-import pooler
+from openerp.osv import fields, osv
+from openerp import pooler
class stock_production_lot(osv.osv):
_inherit = 'stock.production.lot'
diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index 1aeff8d4f78..fdd25133433 100644
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_product(osv.osv):
_inherit = 'product.product'
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index c06c4971474..bfd312103e3 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_product(osv.osv):
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index 61137a5e51e..056d8839a0b 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class product_margin(osv.osv_memory):
_name = 'product.margin'
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 008c1f313a6..3928c2e4676 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -20,8 +20,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class product_pricelist(osv.osv):
_inherit = 'product.pricelist'
diff --git a/addons/project/company.py b/addons/project/company.py
index 6400450cd3e..459c24e7b8a 100644
--- a/addons/project/company.py
+++ b/addons/project/company.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 res_company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/project/project.py b/addons/project/project.py
index 12d7cada034..2e472677b77 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -19,16 +19,17 @@
#
##############################################################################
-import time
-from lxml import etree
from datetime import datetime, date
+from lxml import etree
+import time
-import tools
-from base_status.base_stage import base_stage
-from osv import fields, osv
-from openerp.addons.resource.faces import task as Task
-from tools.translate import _
from openerp import SUPERUSER_ID
+from openep import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+from openerp.addons.base_status.base_stage import base_stage
+from openerp.addons.resource.faces import task as Task
_TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index f3055727d5e..8e7dca059f9 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class report_project_task_user(osv.osv):
_name = "report.project.task.user"
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 85b4bd7001b..2604ebde732 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class project_configuration(osv.osv_memory):
_name = 'project.config.settings'
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 3e2ff83f078..97fca8c459f 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_partner(osv.osv):
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 544165dc02b..bb15c62db1f 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -21,9 +21,9 @@
from lxml import etree
-import tools
-from tools.translate import _
-from osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class project_task_delegate(osv.osv_memory):
_name = 'project.task.delegate'
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index b00c531717f..1cbea397d5e 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -20,8 +20,8 @@
##############################################################################
from lxml import etree
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class project_task_reevaluate(osv.osv_memory):
_name = 'project.task.reevaluate'
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 4c48ae3db1f..715544cf4fc 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -21,9 +21,9 @@
import sys
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
class project_gtd_context(osv.osv):
_name = "project.gtd.context"
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index fe40db06f5f..26e438b789e 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class project_timebox_empty(osv.osv_memory):
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 47ed784c5f9..ae8fea61e1c 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class project_timebox_fill(osv.osv_memory):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 55aa0fd557b..bc9a93461ba 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -22,12 +22,12 @@
from base_status.base_stage import base_stage
from crm import crm
from datetime import datetime
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
import binascii
import time
-import tools
-from tools import html2plaintext
+from openerp import tools
+from openerp.tools import html2plaintext
class project_issue_version(osv.osv):
_name = "project.issue.version"
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index bb95d5195c4..c38e2769ebb 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -20,8 +20,8 @@
#
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
from crm import crm
AVAILABLE_STATES = [
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index f286f9cac25..cc3b16504a7 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class project_issue_settings(osv.osv_memory):
_name = 'project.config.settings'
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 3d079cd2983..8fe645e19fe 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv,orm
-from tools.translate import _
+from openerp.osv import fields,osv,orm
+from openerp.tools.translate import _
class project_issue(osv.osv):
_inherit = 'project.issue'
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index db6c532d503..fbf4b7e39a6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
from openerp.addons.resource.faces import task as Task
class project_phase(osv.osv):
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 85ab158e0b2..c9aa7eb3573 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class project_compute_phases(osv.osv_memory):
_name = 'project.compute.phases'
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 24240f90a54..f21dab8a6d2 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class project_compute_tasks(osv.osv_memory):
_name = 'project.compute.tasks'
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 8733c06b223..d42cf1e7565 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import netsvc
+from openerp.osv import fields, osv
+from openerp import netsvc
class project_task(osv.osv):
_name = "project.task"
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 6948f54ec09..69d524c44e2 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.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 procurement_order(osv.osv):
_name = "procurement.order"
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 439ff6d835d..3ce94700614 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -21,10 +21,10 @@
import time
import datetime
-from osv import fields, osv
-import pooler
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
class project_project(osv.osv):
_inherit = 'project.project'
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 89476b991b1..679868b4107 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -21,8 +21,8 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class report_timesheet_task_user(osv.osv):
_name = "report.timesheet.task.user"
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
index 2a01605782c..275f5ea200d 100644
--- a/addons/purchase/company.py
+++ b/addons/purchase/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index cdb4c0ca73d..f87a83e6cad 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -20,8 +20,8 @@
##############################################################################
from openerp.osv import osv
-from edi import EDIMixin
-from tools.translate import _
+from openerp.tools.translate import _
+from openerp.addons.edi import EDIMixin
PURCHASE_ORDER_LINE_EDI_STRUCT = {
'name': True,
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 6649ebfea9d..56eaf288fe6 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_name = 'res.partner'
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index aaaa9ddc5a5..c554700d2fb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -23,13 +23,13 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
-import netsvc
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
+from openerp import pooler
+from openerp.tools.translate import _
import decimal_precision as dp
from osv.orm import browse_record, browse_null
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
class purchase_order(osv.osv):
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index c253467f12a..e415af53434 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 76ffddcb85f..1855ed173ca 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -23,8 +23,8 @@
# Please note that these reports are not multi-currency !!!
#
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class purchase_report(osv.osv):
_name = "purchase.report"
diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py
index dffeeed7aba..1179e704eb0 100644
--- a/addons/purchase/report/request_quotation.py
+++ b/addons/purchase/report/request_quotation.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class request_quotation(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 13a54031254..bfe2cdf6bca 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class purchase_config_settings(osv.osv_memory):
_name = 'purchase.config.settings'
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 671a21ef364..60b439a2097 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class stock_move(osv.osv):
_inherit = 'stock.move'
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index fc2560f7791..23529d5a950 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class purchase_line_invoice(osv.osv_memory):
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 13bfb539861..153ba0dc774 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -20,11 +20,11 @@
##############################################################################
import time
-from osv import fields, osv
-import netsvc
-import pooler
+from openerp.osv import fields, osv
+from openerp import netsvc
+from openerp import pooler
from osv.orm import browse_record, browse_null
-from tools.translate import _
+from openerp.tools.translate import _
class purchase_order_group(osv.osv_memory):
_name = "purchase.order.group"
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 9be9e828d22..c80beddd20f 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class purchase_order_line(osv.osv):
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 1e2181fc9f3..157694cf0cc 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class purchase_config_settings(osv.osv_memory):
_inherit = 'purchase.config.settings'
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index ea2346d3aab..342d7709c8c 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -22,10 +22,10 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
import time
-import netsvc
+from openerp import netsvc
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
import decimal_precision as dp
class purchase_requisition(osv.osv):
diff --git a/addons/purchase_requisition/report/requisition.py b/addons/purchase_requisition/report/requisition.py
index 4e3f3dd93a3..315a34d37e9 100644
--- a/addons/purchase_requisition/report/requisition.py
+++ b/addons/purchase_requisition/report/requisition.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class requisition(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 40057fae197..9f680e4c9e3 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
from osv.orm import browse_record, browse_null
-from tools.translate import _
+from openerp.tools.translate import _
class purchase_requisition_partner(osv.osv_memory):
_name = "purchase.requisition.partner"
diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py
index 815d3efc1fb..c1f3823c9d8 100644
--- a/addons/report_intrastat/report/invoice.py
+++ b/addons/report_intrastat/report/invoice.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
class account_invoice_intrastat(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 5a0c31bbdcc..3640f27626c 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from tools.sql import drop_view_if_exists
from decimal_precision import decimal_precision as dp
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index eaf3c02b50f..1e4d06b9b2f 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -29,7 +29,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class ResCompany(osv.osv):
"""Override company to add Header object link a company can have many header and logos"""
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index b052c612445..71deb57c370 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -29,7 +29,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class HeaderHTML(osv.osv):
"""HTML Header allows you to define HTML CSS and Page format"""
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 68e129d021d..c2c3612f11d 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -29,8 +29,8 @@
#
##############################################################################
-from osv import osv, fields
-import netsvc
+from openerp.osv import fields, osv
+from openerp import netsvc
from webkit_report import WebKitParser
from report.report_sxw import rml_parse
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index 8d0a27998b0..f1df1e786e3 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -29,7 +29,7 @@
#
##############################################################################
-import pooler
+from openerp import pooler
class WebKitHelper(object):
"""Set of usefull report helper"""
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index b03289c8748..f866608f096 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -33,7 +33,7 @@
import subprocess
import os
import sys
-import report
+from openerp import report
import tempfile
import time
import logging
@@ -42,13 +42,13 @@ from mako.template import Template
from mako.lookup import TemplateLookup
from mako import exceptions
-import netsvc
-import pooler
+from openerp import netsvc
+from openerp import pooler
from report_helper import WebKitHelper
from report.report_sxw import *
-import addons
-import tools
-from tools.translate import _
+from openerp import addons
+from openerp import tools
+from openerp.tools.translate import _
from osv.osv import except_osv
_logger = logging.getLogger(__name__)
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 30aab0957d2..b0e761752f6 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -29,9 +29,9 @@
#
##############################################################################
-from tools.translate import _
-from osv import fields, osv
-import pooler
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
class report_webkit_actions(osv.osv_memory):
_name = "report.webkit.actions"
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 45fd9c20bc9..b243b254d57 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -22,8 +22,8 @@
from datetime import datetime, timedelta
import math
from faces import *
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
from itertools import groupby
from operator import itemgetter
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index 15389f1481c..5382995358c 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -20,7 +20,7 @@
##############################################################################
from openerp.osv import osv
-from edi import EDIMixin
+from openerp.addons.edi import EDIMixin
SALE_ORDER_LINE_EDI_STRUCT = {
'sequence': True,
diff --git a/addons/sale/report/sale_order.py b/addons/sale/report/sale_order.py
index 430e1a03f76..b4f0b1589aa 100644
--- a/addons/sale/report/sale_order.py
+++ b/addons/sale/report/sale_order.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index f592a8fd66c..a20ba01f300 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class sale_report(osv.osv):
_name = "sale.report"
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index d8e9d0fef6f..52f38a23486 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 5e8d05b62c1..1b37b609179 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.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 res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ccd53c47b25..208e30235f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -22,12 +22,12 @@
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
import time
-import pooler
-from osv import fields, osv
-from tools.translate import _
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+from openerp import pooler
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
import decimal_precision as dp
-import netsvc
+from openerp import netsvc
class sale_shop(osv.osv):
_name = "sale.shop"
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 54001f645c8..9b10d8178f5 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
-import netsvc
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp import netsvc
class sale_order_line_make_invoice(osv.osv_memory):
_name = "sale.order.line.make.invoice"
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index c874323e2b8..ae1fd020c68 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -18,9 +18,9 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class sale_make_invoice(osv.osv_memory):
_name = "sale.make.invoice"
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0fa4cd52cf2..2a786f3785f 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -18,8 +18,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import decimal_precision as dp
class sale_advance_payment_inv(osv.osv_memory):
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 872e8b0bffc..2abbab7ab38 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_line(osv.osv):
_inherit = 'sale.order.line'
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale_crm/report/sales_crm_account_invoice_report.py
index 27da7640946..c12db9bfdb0 100644
--- a/addons/sale_crm/report/sales_crm_account_invoice_report.py
+++ b/addons/sale_crm/report/sales_crm_account_invoice_report.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class account_invoice_report(osv.osv):
_inherit = 'account.invoice.report'
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 3bca4053194..b1d50fc0270 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class sale_order(osv.osv):
_inherit = 'sale.order'
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 10225990229..02d36f14c21 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.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 crm_make_sale(osv.osv_memory):
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 3ae8e912efe..8463ab3f3bd 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class sale_journal_invoice_type(osv.osv):
_name = 'sale_journal.invoice.type'
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index bbb2df673ff..2879e45ca71 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_line(osv.osv):
_inherit = "sale.order.line"
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 7397edbec2b..a5043d3b7d5 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class mrp_production(osv.osv):
_inherit = 'mrp.production'
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 49e10eab787..d54eca88ca5 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -22,7 +22,7 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_dates(osv.osv):
_inherit = 'sale.order'
diff --git a/addons/sale_stock/company.py b/addons/sale_stock/company.py
index b316269ac9a..67440ed6c67 100644
--- a/addons/sale_stock/company.py
+++ b/addons/sale_stock/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index a523c0551f2..ade84b269e6 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class sale_report(osv.osv):
_inherit = "sale.report"
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 43e1cfc6778..53cb0c2b8fa 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index d60803aae16..b26e5061d7f 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -20,11 +20,11 @@
#
##############################################################################
from datetime import datetime, timedelta
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
-import netsvc
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
+from openerp.tools.translate import _
class sale_shop(osv.osv):
_inherit = "sale.shop"
diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py
index a06be3af6de..d569b51fe85 100644
--- a/addons/sale_stock/stock.py
+++ b/addons/sale_stock/stock.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class stock_move(osv.osv):
_inherit = 'stock.move'
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index db4184ce378..25fd25c234f 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_groups(osv.osv):
_name = "res.groups"
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 6a1f5681f4f..dcd02276d0e 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -27,11 +27,11 @@ from openerp import SUPERUSER_ID
import simplejson
-import tools
-from osv import osv, fields
-from osv import expression
-from tools.translate import _
-from tools.safe_eval import safe_eval
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.osv import expression
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
import openerp
_logger = logging.getLogger(__name__)
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index 6cce00cf75c..f5f02b7cd19 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4d955495c28..736f7cf6531 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.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 _
import decimal_precision as dp
class product_product(osv.osv):
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index bf2fd32e32c..9d6626bbd14 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class lot_overview(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 552949ec4b2..ca6611de89b 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class lot_overview_all(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 711abbf6259..a33ec28cb35 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class picking(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 1d882ad632b..771af8a59fc 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -24,11 +24,11 @@ from dateutil.relativedelta import relativedelta
import osv
import time
-from report.interface import report_int
-from report.render import render
+from openerp.report.interface import report_int
+from openerp.report.render import render
import stock_graph
-import pooler
+from openerp import pooler
import StringIO
class external_pdf(render):
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 19fae806fc0..7f5dd07e633 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import tools
from tools.sql import drop_view_if_exists
class stock_report_prodlots(osv.osv):
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 4f8aedcd5a6..e6d3618b190 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
from decimal_precision import decimal_precision as dp
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 8ed8800fb29..98bff4487af 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import pooler
-from report.interface import report_rml
+from openerp import pooler
+from openerp.report.interface import report_rml
from report.interface import toxml
#FIXME: we should use toxml
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index d92de2805b5..59b383b80e9 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -21,8 +21,8 @@
from pychart import *
import pychart.legend
import time
-from report.misc import choice_colors
-import tools
+from openerp.report.misc import choice_colors
+from openerp import tools
#
# Draw a graph for stocks
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
index 762373f1250..21a7c458ecc 100644
--- a/addons/stock/report/stock_inventory_move_report.py
+++ b/addons/stock/report/stock_inventory_move_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class stock_inventory_move(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index b150847153e..9653c284b4b 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class stock_config_settings(osv.osv_memory):
_name = 'stock.config.settings'
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 53d2e9d327e..c08fd00363a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -26,11 +26,11 @@ import time
from operator import itemgetter
from itertools import groupby
-from osv import fields, osv
-from tools.translate import _
-import netsvc
-import tools
-from tools import float_compare
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
+from openerp import tools
+from openerp.tools import float_compare
import decimal_precision as dp
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 3c1ba2c17a0..9780b00be9e 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import decimal_precision as dp
-from tools.translate import _
-import tools
+from openerp.tools.translate import _
+from openerp import tools
class stock_change_product_qty(osv.osv_memory):
_name = "stock.change.product.qty"
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 0f3553c2cd5..7268d66c1ba 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.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 _
import decimal_precision as dp
class change_standard_price(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index f0caa19c5e1..237033bb7b0 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.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 stock_fill_inventory(osv.osv_memory):
_name = "stock.fill.inventory"
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 4d99d9d79e5..fef291769b9 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class stock_inventory_line_split(osv.osv_memory):
_inherit = "stock.move.split"
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index b61ccbbed84..171a193e173 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.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 stock_inventory_merge(osv.osv_memory):
_name = "stock.inventory.merge"
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 059c68e5054..7c960c5e617 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
-from tools.translate import _
+from openerp.tools.translate import _
class stock_invoice_onshipping(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 4832788927b..59d99167e6a 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.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 stock_location_product(osv.osv_memory):
_name = "stock.location.product"
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 538fa1c9441..584fb87b0f6 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.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 _
import decimal_precision as dp
class stock_move_consume(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index aeda84efb75..48bc1714cde 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
import time
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index f3801bf9024..8159fd67cf7 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -21,11 +21,11 @@
import time
from lxml import etree
-from osv import fields, osv
+from openerp.osv import fields, osv
from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
from tools.float_utils import float_compare
import decimal_precision as dp
-from tools.translate import _
+from openerp.tools.translate import _
class stock_partial_picking_line(osv.TransientModel):
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index abe1754a49e..4270fea89f7 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -19,11 +19,11 @@
#
##############################################################################
-import netsvc
+from openerp import netsvc
import time
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
import decimal_precision as dp
class stock_return_picking_memory(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 1b70a36f8e4..5566a408beb 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.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 _
import decimal_precision as dp
class stock_split_into(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index d61f6323f77..123a76acd43 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.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 action_traceability(osv.osv_memory):
"""
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 4bb0ab41d88..5de6490dc0f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class invoice_directly(osv.osv_memory):
_inherit = 'stock.partial.picking'
diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 419118cda96..eb5235d35ba 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -18,9 +18,9 @@
#
##############################################################################
-from osv import osv
-import netsvc
-from tools.translate import _
+from openerp.osv import osv
+from openerp import netsvc
+from openerp.tools.translate import _
class procurement_order(osv.osv):
_inherit = 'procurement.order'
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index d025bc9252d..1dc31089b22 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class stock_location_path(osv.osv):
_name = "stock.location.path"
diff --git a/addons/stock_no_autopicking/stock_no_autopicking.py b/addons/stock_no_autopicking/stock_no_autopicking.py
index 03a5c45f14e..904854f3533 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking.py
+++ b/addons/stock_no_autopicking/stock_no_autopicking.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class product(osv.osv):
_inherit = "product.product"
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 25137f6303c..d181e97e8f0 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -23,8 +23,8 @@
# Error treatment: exception, request, ... -> send request to user_id
import time
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
class subscription_document(osv.osv):
_name = "subscription.document"
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index a12cac7f639..b4e7765346c 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -20,12 +20,12 @@
#
##############################################################################
-import pooler
-from report.interface import report_rml
-from tools import to_xml
-import tools
import time
-from report import report_sxw
+
+from openerp import pooler, tools
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml
+from openerp.tools import to_xml
class survey_analysis(report_rml):
def create(self, cr, uid, ids, datas, context):
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index ba34b9c33e9..f910140727d 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -20,12 +20,12 @@
#
##############################################################################
-import pooler
-from report.interface import report_rml
-from tools import to_xml
-import tools
import time
-from report import report_sxw
+
+from openerp import pooler, tools
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml
+from openerp.tools import to_xml
class survey_browse_response(report_rml):
def create(self, cr, uid, ids, datas, context):
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index f5f459f12f0..98fc38da8bd 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -20,10 +20,9 @@
#
##############################################################################
-import pooler
-from report.interface import report_rml
-from tools import to_xml
-import tools
+from openerp import pooler, tools
+from openerp.report.interface import report_rml
+from openerp.tools import to_xml
class survey_form(report_rml):
def create(self, cr, uid, ids, datas, context):
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index ad903ffd06b..241b9739016 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -19,18 +19,16 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-import tools
-import netsvc
-from tools.translate import _
-
-from time import strftime
+import copy
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import copy
+from time import strftime
import os
+from openerp import netsvc, tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
class survey_type(osv.osv):
_name = 'survey.type'
_description = 'Survey Type'
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 17253447c4f..e3b966fc673 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -18,20 +18,18 @@
# along with this program. If not, see .
#
##############################################################################
-import os
-import datetime
-from lxml import etree
-from time import strftime
import base64
-import tools
-import netsvc
-from osv import osv
-from osv import fields
-from tools import to_xml
-from tools.translate import _
-import addons
-from tools.safe_eval import safe_eval
+import datetime
+from lxml import etree
+import os
+from time import strftime
+
+from openerp import addons, netsvc, tools
+from openerp.osv import fields, osv
+from openerp.tools import to_xml
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
class survey_question_wiz(osv.osv_memory):
_name = 'survey.question.wiz'
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 5af913993b2..a37a4e4f7ca 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -19,8 +19,7 @@
#
##############################################################################
-from osv import osv
-from osv import fields
+from openerp.osv import fields, osv
class survey_browse_answer(osv.osv_memory):
_name = 'survey.browse.answer'
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index 6ae84ed37cc..2646917cf07 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -20,9 +20,8 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class survey_print(osv.osv_memory):
_name = 'survey.print'
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 02db236d233..0cadd6bf832 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -19,9 +19,8 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class survey_print_answer(osv.osv_memory):
_name = 'survey.print.answer'
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index bd8b9f2ad14..f2e25eb8d53 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -19,9 +19,8 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class survey_print_statistics(osv.osv_memory):
_name = 'survey.print.statistics'
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index f3835a751b4..a8f83ba0361 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -19,11 +19,11 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
from lxml import etree
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
class survey_name_wiz(osv.osv_memory):
_name = 'survey.name.wiz'
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 936e3363bde..4913ca09eab 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -26,12 +26,9 @@ import os
import datetime
import socket
-from osv import fields
-from osv import osv
-import tools
-from tools.translate import _
-import netsvc
-import addons
+from openerp import addons, netsvc, tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class survey_send_invitation(osv.osv_memory):
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index fee5259c4dc..d7a6f5be1b2 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
WARNING_MESSAGE = [
('no-message','No Message'),
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 71865c7fcc1..dc429cd2f29 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -23,7 +23,7 @@ import base64
import urllib2
import openerp
-from osv import osv, fields
+from openerp.osv import fields, osv
class Binary(openerp.addons.web.http.Controller):
_cp_path = "/web_linkedin/binary"