diff --git a/addons/account/account.py b/addons/account/account.py index f0c16d8586c..eb552787031 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -24,7 +24,7 @@ from datetime import datetime from dateutil.relativedelta import relativedelta from operator import itemgetter -import netsvc +import logging import pooler from osv import fields, osv import decimal_precision as dp @@ -212,7 +212,7 @@ class account_account(osv.osv): _name = "account.account" _description = "Account" _parent_store = True - logger = netsvc.Logger() + logger = logging.getLogger(__name__) def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): @@ -295,7 +295,7 @@ class account_account(osv.osv): if aml_query.strip(): wheres.append(aml_query.strip()) filters = " AND ".join(wheres) - self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, + self.logger.warning('addons.'+self._name, logging.LOG_DEBUG, 'Filters: %s'%filters) # IN might not work ideally in case there are too many # children_and_consolidated, in that case join on a @@ -312,7 +312,7 @@ class account_account(osv.osv): " GROUP BY l.account_id") params = (tuple(children_and_consolidated),) + query_params cr.execute(request, params) - self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, + self.logger.warning('addons.'+self._name, logging.LOG_DEBUG, 'Status: %s'%cr.statusmessage) for res in cr.dictfetchall(): @@ -2095,8 +2095,7 @@ class account_tax(osv.osv): } def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None): - logger = netsvc.Logger() - logger.notifyChannel("warning", netsvc.LOG_WARNING, + logger.warning("warning", logging.LOG_WARNING, "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included") return self._compute(cr, uid, taxes, price_unit, quantity, product, partner) diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index d42e188679a..29b4c4fdb84 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -23,7 +23,6 @@ import time from osv import osv, fields import decimal_precision as dp -import netsvc from tools.translate import _ class account_bank_statement(osv.osv): 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 8e1e4b09e47..cdddfec6267 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 @@ -23,13 +23,13 @@ import time from report import report_sxw import pooler -import netsvc -logger=netsvc.Logger() +import logging +logger=logging.getLogger(__name__) class bank_statement_balance_report(report_sxw.rml_parse): def set_context(self, objects, data, ids, report_type=None): - #logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) + #logger.warning('addons.'+__name__, logging.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) cr = self.cr uid = self.uid context = self.context diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py index e3cc6f40a0c..0d33ed11a99 100644 --- a/addons/account_coda/account_coda.py +++ b/addons/account_coda/account_coda.py @@ -22,9 +22,9 @@ from osv import osv, fields import decimal_precision as dp -import netsvc +import logging from tools.translate import _ -logger=netsvc.Logger() +logger=logging.getLogger(__name__) class coda_bank_account(osv.osv): _name= 'coda.bank.account' diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py index c49eb9f1dbd..43d4e42e8c5 100644 --- a/addons/account_coda/wizard/account_coda_import.py +++ b/addons/account_coda/wizard/account_coda_import.py @@ -24,11 +24,11 @@ import time import base64 from osv import fields,osv from tools.translate import _ -import netsvc +import logging import re from traceback import format_exception from sys import exc_info -logger=netsvc.Logger() +logger=logging.getLogger(__name__) class account_coda_import(osv.osv_memory): _name = 'account.coda.import' @@ -816,7 +816,7 @@ class account_coda_import(osv.osv_memory): ttype = line['type'] == 'supplier' and 'payment' or 'receipt', date = line['val_date'], context = context) - #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'voucher_dict = %s' % voucher_dict) + #logger.warning('addons.'+self._name, logging.LOG_WARNING, 'voucher_dict = %s' % voucher_dict) voucher_line_vals = False if voucher_dict['value']['line_ids']: for line_dict in voucher_dict['value']['line_ids']: @@ -889,21 +889,21 @@ class account_coda_import(osv.osv_memory): nb_err += 1 err_string += _('\nError ! ') + str(e) tb = ''.join(format_exception(*exc_info())) - logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, + logger.warning('addons.'+self._name, logging.LOG_ERROR, 'Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) except Exception, e: cr.rollback() nb_err += 1 err_string += _('\nSystem Error : ') + str(e) tb = ''.join(format_exception(*exc_info())) - logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, + logger.warning('addons.'+self._name, logging.LOG_ERROR, 'System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) except : cr.rollback() nb_err += 1 err_string = _('\nUnknown Error : ') + str(e) tb = ''.join(format_exception(*exc_info())) - logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, + logger.warning('addons.'+self._name, logging.LOG_ERROR, 'Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) # end 'for statement in coda_statements' diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 997036c0cec..fd9532e27dd 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -23,8 +23,8 @@ import re, time, random from osv import fields, osv from tools.translate import _ -import netsvc -logger=netsvc.Logger() +import logging +logger=logging.getLogger(__name__) """ account.invoice object: @@ -41,7 +41,7 @@ class account_invoice(osv.osv): context=context) res[[i for i,x in enumerate(res) if x[0] == 'none'][0]] = ('none', 'Free Communication') res.append(('bba', 'BBA Structured Communication')) - #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'reference_type = %s' %res ) + #logger.warning('addons.'+self._name, logging.LOG_WARNING, 'reference_type = %s' %res ) return res def check_bbacomm(self, val): @@ -68,7 +68,7 @@ class account_invoice(osv.osv): result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id, date_invoice, payment_term, partner_bank_id, company_id) # reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type'] -# logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'partner_id %s' % partner_id) +# logger.warning('addons.'+self._name, logging.LOG_WARNING, 'partner_id %s' % partner_id) reference = False reference_type = 'none' if partner_id: @@ -215,5 +215,5 @@ class account_invoice(osv.osv): ] account_invoice() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py index 04a51c3a6ab..ad17e62a3fb 100644 --- a/addons/l10n_be_invoice_bba/partner.py +++ b/addons/l10n_be_invoice_bba/partner.py @@ -24,8 +24,8 @@ from osv import fields, osv import time from tools.translate import _ -import netsvc -logger=netsvc.Logger() +import logging +logger=logging.getLogger(__name__) class res_partner(osv.osv): """ add field to indicate default 'Communication Type' on customer invoices """