diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py index e1710ae6f84..4a3b632a8de 100644 --- a/addons/account_budget/report/crossovered_budget_report.py +++ b/addons/account_budget/report/crossovered_budget_report.py @@ -25,7 +25,7 @@ import datetime from openerp import pooler from openerp.report import report_sxw import operator -import osv +from openerp import osv class budget_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): 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 34e6a266fd5..071c32e4ceb 100644 --- a/addons/base_report_designer/wizard/base_report_designer_modify.py +++ b/addons/base_report_designer/wizard/base_report_designer_modify.py @@ -21,7 +21,7 @@ ############################################################################## import time from openerp import wizard -import osv +from openerp import osv from openerp import pooler import urllib import base64 diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py index 3772ec01b33..fb778f0ea74 100644 --- a/addons/base_vat/base_vat.py +++ b/addons/base_vat/base_vat.py @@ -33,7 +33,7 @@ except ImportError: vatnumber = None from openerp.osv import fields, osv -from tools.misc import ustr +from openerp.tools.misc import ustr from openerp.tools.translate import _ _ref_vat = { diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index 394205e57ee..9d8c6a3d136 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -29,7 +29,7 @@ import logging import shutil from StringIO import StringIO import psycopg2 -from tools.misc import ustr +from openerp.tools.misc import ustr from openerp.tools.translate import _ from openerp.osv.orm import except_orm import random diff --git a/addons/document/nodes.py b/addons/document/nodes.py index ab0615f521a..9513434374f 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -23,7 +23,7 @@ from openerp import pooler from openerp.tools.safe_eval import safe_eval -from tools.misc import ustr +from openerp.tools.misc import ustr import errno # import os import time diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 0297e4423f9..58c982b8b5d 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -37,7 +37,7 @@ import logging from openerp import netsvc from dav_fs import openerp_dav_handler -from tools.config import config +from openerp.tools.config import config from DAV.WebDAVServer import DAVRequestHandler from service import http_server from service.websrv_lib import FixSendError, HttpOptions diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index fcf000cab70..a76288d23e2 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -24,7 +24,7 @@ import time from openerp.osv import fields, osv from openerp.report.interface import report_rml -from report.interface import toxml +from openerp.report.interface import toxml from openerp import pooler import time diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index f58accc2639..b86a6e8e89d 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -22,7 +22,7 @@ import datetime from openerp.report.interface import report_rml -from report.interface import toxml +from openerp.report.interface import toxml from openerp.tools.translate import _ import time from openerp import pooler diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index 5580355df8b..4827994f2cd 100644 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -21,7 +21,7 @@ import datetime from openerp.report.interface import report_rml -from report.interface import toxml +from openerp.report.interface import toxml import time from openerp import pooler from openerp.tools.translate import _ 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 1c1cdef2c25..02b46b71b20 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv import fields,osv -from tools.sql import drop_view_if_exists +from openerp.tools.sql import drop_view_if_exists class report_timesheet_line(osv.osv): _name = "report.timesheet.line" diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py index e1a7ab08dbc..70d7d6245d3 100644 --- a/addons/l10n_br/account.py +++ b/addons/l10n_br/account.py @@ -26,7 +26,7 @@ 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 openerp.tools.misc import currency from openerp.tools.translate import _ from openerp.tools import config from openerp import SUPERUSER_ID diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index f11513b756d..42765f84d0d 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -34,11 +34,11 @@ from report_webkit import webkit_report from report_webkit import report_helper from openerp.osv import osv -from osv.osv import except_osv +from openerp.osv.osv import except_osv from openerp.tools import mod10r from openerp.tools.translate import _ -from tools.config import config +from openerp.tools.config import config from openerp import wizard from openerp import addons diff --git a/addons/mail/update.py b/addons/mail/update.py index fa360dd3d8c..579203c64d6 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -6,11 +6,11 @@ import urllib import urllib2 from openerp import pooler -import release +from openerp import release 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 openerp.tools.config import config from openerp.tools import misc _logger = logging.getLogger(__name__) diff --git a/addons/product/report/pricelist.py b/addons/product/report/pricelist.py index f8d41504c6c..6799a3b4b32 100644 --- a/addons/product/report/pricelist.py +++ b/addons/product/report/pricelist.py @@ -21,7 +21,7 @@ import datetime from openerp.report.interface import report_rml -from report.interface import toxml +from openerp.report.interface import toxml from openerp import pooler from openerp.osv import osv import datetime diff --git a/addons/project/project.py b/addons/project/project.py index 2e472677b77..05f37e7d26c 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -24,7 +24,7 @@ from lxml import etree import time from openerp import SUPERUSER_ID -from openep import tools +from openerp import tools from openerp.osv import fields, osv from openerp.tools.translate import _ diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index c554700d2fb..29de1fe30fd 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -28,7 +28,7 @@ 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 openerp.osv.orm import browse_record, browse_null 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/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py index 153ba0dc774..b47f4e608a8 100644 --- a/addons/purchase/wizard/purchase_order_group.py +++ b/addons/purchase/wizard/purchase_order_group.py @@ -23,7 +23,7 @@ import time from openerp.osv import fields, osv from openerp import netsvc from openerp import pooler -from osv.orm import browse_record, browse_null +from openerp.osv.orm import browse_record, browse_null from openerp.tools.translate import _ class purchase_order_group(osv.osv_memory): diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index 9f680e4c9e3..58a72556b22 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -21,7 +21,7 @@ import time from openerp.osv import fields, osv -from osv.orm import browse_record, browse_null +from openerp.osv.orm import browse_record, browse_null from openerp.tools.translate import _ class purchase_requisition_partner(osv.osv_memory): diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py index 3640f27626c..6eea69e4146 100644 --- a/addons/report_intrastat/report_intrastat.py +++ b/addons/report_intrastat/report_intrastat.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv import fields, osv -from tools.sql import drop_view_if_exists +from openerp.tools.sql import drop_view_if_exists from decimal_precision import decimal_precision as dp diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index c2c3612f11d..1385f504928 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -32,7 +32,7 @@ from openerp.osv import fields, osv from openerp import netsvc from webkit_report import WebKitParser -from report.report_sxw import rml_parse +from openerp.report.report_sxw import rml_parse def register_report(name, model, tmpl_path, parser=rml_parse): """Register the report into the services""" diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index f866608f096..36ef2eb7c38 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -45,11 +45,11 @@ from mako import exceptions from openerp import netsvc from openerp import pooler from report_helper import WebKitHelper -from report.report_sxw import * +from openerp.report.report_sxw import * from openerp import addons from openerp import tools from openerp.tools.translate import _ -from osv.osv import except_osv +from openerp.osv.osv import except_osv _logger = logging.getLogger(__name__) diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py index 771af8a59fc..9ccda54b693 100644 --- a/addons/stock/report/product_stock.py +++ b/addons/stock/report/product_stock.py @@ -22,7 +22,7 @@ from datetime import datetime from dateutil.relativedelta import relativedelta -import osv +from openerp import osv import time from openerp.report.interface import report_int from openerp.report.render import render diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py index 7f5dd07e633..0aac0d6599b 100644 --- a/addons/stock/report/report_stock.py +++ b/addons/stock/report/report_stock.py @@ -22,7 +22,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import tools -from tools.sql import drop_view_if_exists +from openerp.tools.sql import drop_view_if_exists class stock_report_prodlots(osv.osv): _name = "stock.report.prodlots" diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py index 98bff4487af..7ca209c9ed2 100644 --- a/addons/stock/report/stock_by_location.py +++ b/addons/stock/report/stock_by_location.py @@ -21,7 +21,7 @@ from openerp import pooler from openerp.report.interface import report_rml -from report.interface import toxml +from openerp.report.interface import toxml #FIXME: we should use toxml diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py index 48bc1714cde..89744615f22 100644 --- a/addons/stock/wizard/stock_partial_move.py +++ b/addons/stock/wizard/stock_partial_move.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv import fields, osv -from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT import time class stock_partial_move_line(osv.osv_memory): diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index 8159fd67cf7..f4cdb86edec 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -22,8 +22,8 @@ import time from lxml import etree from openerp.osv import fields, osv -from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT -from tools.float_utils import float_compare +from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools.float_utils import float_compare import decimal_precision as dp from openerp.tools.translate import _