From 245f0fe9f8af41861ebff15acd3234e60258e270 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 27 Mar 2013 14:43:37 +0100 Subject: [PATCH] [REF] account: removed openerp.pooler imports. bzr revid: vmt@openerp.com-20130327134337-rpktoa5gj31iof5c --- addons/account/account.py | 5 +++-- addons/account/account_financial_report.py | 1 - addons/account/account_invoice.py | 1 - addons/account/project/report/analytic_journal.py | 1 - addons/account/project/report/cost_ledger.py | 1 - .../project/report/inverted_analytic_balance.py | 1 - .../account/project/report/quantity_cost_ledger.py | 1 - addons/account/report/account_print_overdue.py | 7 +++---- addons/account/report/account_report.py | 5 ++--- addons/account/report/common_report_header.py | 14 +++++++------- addons/account/wizard/account_invoice_state.py | 7 ++----- 11 files changed, 17 insertions(+), 27 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 8c7f058acc6..bb24aec1748 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -25,8 +25,9 @@ from dateutil.relativedelta import relativedelta from operator import itemgetter import time +import openerp from openerp import SUPERUSER_ID -from openerp import pooler, tools +from openerp import tools from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools.float_utils import float_round @@ -1883,7 +1884,7 @@ class account_tax(osv.osv): def get_precision_tax(): def change_digit_tax(cr): - res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account') + res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account') return (16, res+2) return change_digit_tax diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py index 1d9a4a794eb..6a2b1bd5e8f 100644 --- a/addons/account/account_financial_report.py +++ b/addons/account/account_financial_report.py @@ -25,7 +25,6 @@ from dateutil.relativedelta import relativedelta from operator import itemgetter 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 _ diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index af762611ec2..30bdc2eedac 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -24,7 +24,6 @@ from lxml import etree import openerp.addons.decimal_precision as dp import openerp.exceptions -from openerp import pooler from openerp.osv import fields, osv, orm from openerp.tools.translate import _ diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index e91de96940e..1ca1ffb3ca4 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw # diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 04b8edeb166..e594ab92a63 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw class account_analytic_cost_ledger(report_sxw.rml_parse): diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py index 829dd03df02..bd86bcfe257 100644 --- a/addons/account/project/report/inverted_analytic_balance.py +++ b/addons/account/project/report/inverted_analytic_balance.py @@ -21,7 +21,6 @@ import time -from openerp import pooler from openerp.report import report_sxw class account_inverted_analytic_balance(report_sxw.rml_parse): diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py index 1fe77f6e878..b22558b900f 100644 --- a/addons/account/project/report/quantity_cost_ledger.py +++ b/addons/account/project/report/quantity_cost_ledger.py @@ -20,7 +20,6 @@ ############################################################################## import time -from openerp import pooler from openerp.report import report_sxw class account_analytic_quantity_cost_ledger(report_sxw.rml_parse): diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 68c1c35ef53..d030c136964 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -22,7 +22,6 @@ import time from openerp.report import report_sxw -from openerp import pooler class Overdue(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): @@ -38,7 +37,7 @@ class Overdue(report_sxw.rml_parse): def _tel_get(self,partner): if not partner: return False - res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') + res_partner = self.pool['res.partner'] addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice']) adr_id = addresses and addresses['invoice'] or False if adr_id: @@ -49,7 +48,7 @@ class Overdue(report_sxw.rml_parse): return False def _lines_get(self, partner): - moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') + moveline_obj = self.pool['account.move.line'] movelines = moveline_obj.search(self.cr, self.uid, [('partner_id', '=', partner.id), ('account_id.type', 'in', ['receivable', 'payable']), @@ -58,7 +57,7 @@ class Overdue(report_sxw.rml_parse): return movelines def _message(self, obj, company): - company_pool = pooler.get_pool(self.cr.dbname).get('res.company') + company_pool = self.pool['res.company'] message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg return message.split('\n') diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index d6cc784c767..11a6374b24e 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -23,7 +23,6 @@ import time from datetime import datetime from dateutil.relativedelta import relativedelta -from openerp import pooler from openerp import tools from openerp.osv import fields,osv @@ -123,7 +122,7 @@ class report_aged_receivable(osv.osv): """ This view will be used in dashboard The reason writing this code here is, we need to check date range from today to first date of fiscal year. """ - pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear') + pool_obj_fy = self.pool['account.fiscalyear'] today = time.strftime('%Y-%m-%d') fy_id = pool_obj_fy.find(cr, uid, exception=False) LIST_RANGES = [] @@ -141,7 +140,7 @@ class report_aged_receivable(osv.osv): cr.execute('delete from temp_range') for range in LIST_RANGES: - pooler.get_pool(cr.dbname).get('temp.range').create(cr, uid, {'name':range}) + self.pool['temp.range'].create(cr, uid, {'name':range}) cr.execute(""" create or replace view report_aged_receivable as ( diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index cedc4ccf5c4..cf3c3a71ff1 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -19,9 +19,9 @@ # ############################################################################## -from openerp import pooler from openerp.tools.translate import _ +# Mixin to use with rml_parse, so self.pool will be defined. class common_report_header(object): def _sum_debit(self, period_id=False, journal_id=False): @@ -75,17 +75,17 @@ class common_report_header(object): def get_start_period(self, data): if data.get('form', False) and data['form'].get('period_from', False): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name + return self.pool.get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name return '' def get_end_period(self, data): if data.get('form', False) and data['form'].get('period_to', False): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name + return self.pool.get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name return '' def _get_account(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name return '' def _get_sortby(self, data): @@ -120,12 +120,12 @@ class common_report_header(object): def _get_fiscalyear(self, data): if data.get('form', False) and data['form'].get('fiscalyear_id', False): - return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name + return self.pool.get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name return '' def _get_company(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name return '' def _get_journal(self, data): @@ -137,7 +137,7 @@ class common_report_header(object): def _get_currency(self, data): if data.get('form', False) and data['form'].get('chart_account_id', False): - return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol return '' #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py index 9fab19ff42c..70d2984cef0 100644 --- a/addons/account/wizard/account_invoice_state.py +++ b/addons/account/wizard/account_invoice_state.py @@ -21,7 +21,6 @@ from openerp.osv import osv from openerp.tools.translate import _ -from openerp import pooler class account_invoice_confirm(osv.osv_memory): """ @@ -34,8 +33,7 @@ class account_invoice_confirm(osv.osv_memory): def invoice_confirm(self, cr, uid, ids, context=None): if context is None: context = {} - pool_obj = pooler.get_pool(cr.dbname) - account_invoice_obj = pool_obj.get('account.invoice') + account_invoice_obj = self.pool['account.invoice'] data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context) for record in data_inv: if record['state'] not in ('draft','proforma','proforma2'): @@ -58,8 +56,7 @@ class account_invoice_cancel(osv.osv_memory): def invoice_cancel(self, cr, uid, ids, context=None): if context is None: context = {} - pool_obj = pooler.get_pool(cr.dbname) - account_invoice_obj = pool_obj.get('account.invoice') + account_invoice_obj = self.pool['account.invoice'] data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context) for record in data_inv: if record['state'] in ('cancel','paid'):