[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)

bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx

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__)
 

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'

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"

addons/account/account_bank_statement.py

@@ -21,9 +21,9 @@
 
 import time
 
-from osv import fields, osv
-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 account_bank_statement(osv.osv):
     def create(self, cr, uid, vals, context=None):

addons/account/account_cash_statement.py

@@ -22,9 +22,9 @@
 
 import time
 
-from osv import osv, fields
-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 account_cashbox_line(osv.osv):
 

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
-import decimal_precision as dp
-from tools.translate import _
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
 
 # ---------------------------------------------------------
 # Account Financial Report

addons/account/account_invoice.py

@@ -21,12 +21,12 @@
 
 import time
 from lxml import etree
-import decimal_precision as dp
+import openerp.addons.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):

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 _
-import decimal_precision as dp
-import tools
+from openerp import netsvc
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+from openerp import tools
 
 class account_move_line(osv.osv):
     _name = "account.move.line"

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"

addons/account/edi/invoice.py

@@ -18,12 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from openerp.osv import osv, fields
+from openerp.addons.edi import EDIMixin
 
 from urllib import urlencode
 
-from openerp.osv import osv, fields
-from edi import EDIMixin
-
 INVOICE_LINE_EDI_STRUCT = {
     'name': True,
     'origin': True,

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):

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'

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'

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"

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'

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

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):

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

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):

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):

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):

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'

addons/account/project/wizard/account_analytic_chart.py

@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
 
 class account_analytic_chart(osv.osv_memory):
     _name = 'account.analytic.chart'

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'

addons/account/project/wizard/account_analytic_cost_ledger_report.py

@@ -18,9 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 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'

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'

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'

addons/account/project/wizard/project_account_analytic_line.py

@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-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"

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):

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"

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):

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

addons/account/report/account_entries_report.py

@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import tools
-from osv import fields,osv
-import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+import openerp.addons.decimal_precision as dp
 
 class account_entries_report(osv.osv):
     _name = "account.entries.report"

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):
 

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):
 

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):

addons/account/report/account_invoice_report.py

@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import tools
-import decimal_precision as dp
-from osv import fields,osv
+from openerp import tools
+import openerp.addons.decimal_precision as dp
+from openerp.osv import fields,osv
 
 class account_invoice_report(osv.osv):
     _name = "account.invoice.report"

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):
 

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):

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):
 

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):

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):

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')

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'

addons/account/report/account_treasury_report.py

@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import tools
-from osv import fields,osv
-import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+import openerp.addons.decimal_precision as dp
 
 class account_treasury_report(osv.osv):
     _name = "account.treasury.report"

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):
 

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'

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"""
 

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'

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'

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):
     """

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"

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):
     """

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):
     """

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):
 

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):
     """

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):
     """

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):
     """

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"

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):
     """

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"

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"

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):
     """

addons/account/wizard/account_reconcile.py

@@ -21,9 +21,9 @@
 
 import time
 
-from osv import fields, osv
-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 account_move_line_reconcile(osv.osv_memory):
     """

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'

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"

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'

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'

addons/account/wizard/account_report_common.py

@@ -22,9 +22,9 @@
 import time
 from lxml import etree
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
 from openerp.osv.orm import setup_modifiers
+from openerp.tools.translate import _
 
 class account_common_report(osv.osv_memory):
     _name = "account.common.report"

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'

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'

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'

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"

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"

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):
     """

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):
     """

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):

addons/account/wizard/account_state_open.py

@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-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'

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):
 

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):
     """

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"

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):
 

addons/account/wizard/account_validate_account_move.py

@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-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"

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'

addons/account/wizard/pos_box.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-from osv import osv, fields
-import decimal_precision as dp
-from tools.translate import _
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
 
 class CashBox(osv.osv_memory):
     _register = False

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, ' \

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},
 

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'

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"

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):

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):

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"

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"

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"

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"

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"

addons/account_anglo_saxon/stock.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv
+from openerp.osv import osv
 
 #----------------------------------------------------------
 # Stock Picking

addons/account_asset/account_asset.py

@@ -23,8 +23,8 @@ import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
-from osv import osv, fields
-import decimal_precision as dp
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
 
 class account_asset_category(osv.osv):
     _name = 'account.asset.category'

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):
 

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"