From 2ac95f1c44f7f835fdae821e553abaf81e90dc3f Mon Sep 17 00:00:00 2001 From: Joel Grand-Guillaume Date: Wed, 19 Dec 2012 13:58:54 +0100 Subject: [PATCH] [MIGR] Adapt import to fit last recomandation --- account_statement_base_completion/partner.py | 6 ++++-- account_statement_base_completion/statement.py | 2 -- account_statement_base_import/statement.py | 11 +++++------ .../wizard/import_statement.py | 8 +++++--- account_statement_ext/account.py | 7 ++++--- account_statement_ext/report/bank_statement_report.py | 3 +-- account_statement_ext/statement.py | 4 ++-- account_statement_ext_voucher/statement_voucher.py | 3 ++- .../statement.py | 6 +++--- account_statement_transactionid_import/statement.py | 4 ++-- base_transaction_id/invoice.py | 7 ++++--- base_transaction_id/sale.py | 5 +++-- base_transaction_id/stock.py | 5 +++-- 13 files changed, 38 insertions(+), 33 deletions(-) diff --git a/account_statement_base_completion/partner.py b/account_statement_base_completion/partner.py index 978de421..aafb40f7 100644 --- a/account_statement_base_completion/partner.py +++ b/account_statement_base_completion/partner.py @@ -19,9 +19,11 @@ # # ################################################################################# -from osv import fields, osv +from openerp.osv.orm import Model +from openerp.osv import fields -class res_partner(osv.osv): + +class res_partner(Model): """ Add a bank label on the partner so that we can use it to match this partner when we found this in a statement line. diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py index 7c453369..abc65ee4 100644 --- a/account_statement_base_completion/statement.py +++ b/account_statement_base_completion/statement.py @@ -19,8 +19,6 @@ # ############################################################################## from tools.translate import _ -import netsvc -logger = netsvc.Logger() from openerp.osv.orm import Model, fields from openerp.osv import fields, osv from operator import itemgetter, attrgetter diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index f9827320..ec88f0ef 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -19,13 +19,12 @@ # ############################################################################## -from tools.translate import _ +from openerp.tools.translate import _ import datetime import netsvc logger = netsvc.Logger() -from openerp.osv.orm import Model, fields -from openerp.osv import fields, osv -# from account_statement_base_import.parser.file_parser import FileParser +from openerp.osv.orm import Model +from openerp.osv import fields from parser import new_bank_statement_parser import sys import traceback @@ -71,8 +70,8 @@ class AccountStatementProfil(Model): + _("Bank Statement ID %s have been imported with %s lines ") %(statement_id, num_lines)] log = "\n".join(log_line) self.write(cr, uid, id, {'rec_log' : log, 'last_import_date':import_date}, context=context) - logger.notifyChannel('Bank Statement Import', netsvc.LOG_INFO, - "Bank Statement ID %s have been imported with %s lines "%(statement_id, num_lines)) + self.message_post(cr, uid, [statement_id], body=_('Statement ID %s have been imported with %s lines.') + % (statement_id,num_lines), context=context) return True def prepare_global_commission_line_vals(self, cr, uid, parser, diff --git a/account_statement_base_import/wizard/import_statement.py b/account_statement_base_import/wizard/import_statement.py index 6be40c06..cb0e84b5 100644 --- a/account_statement_base_import/wizard/import_statement.py +++ b/account_statement_base_import/wizard/import_statement.py @@ -23,11 +23,13 @@ Wizard to import financial institute date in bank statement """ -from osv import fields, osv -from tools.translate import _ +from openerp.osv import osv, orm +from openerp.osv import fields + +from openerp.tools.translate import _ import os -class CreditPartnerStatementImporter(osv.osv_memory): +class CreditPartnerStatementImporter(orm.TransientModel): _name = "credit.statement.import" def default_get(self, cr, uid, fields, context=None): diff --git a/account_statement_ext/account.py b/account_statement_ext/account.py index 701ba042..dc907d32 100644 --- a/account_statement_ext/account.py +++ b/account_statement_ext/account.py @@ -18,9 +18,10 @@ # along with this program. If not, see . # ############################################################################## -import netsvc -logger = netsvc.Logger() -from openerp.osv.orm import Model, fields + +from openerp.osv.orm import Model +from openerp.osv import fields + class account_move(Model): _inherit='account.move' diff --git a/account_statement_ext/report/bank_statement_report.py b/account_statement_ext/report/bank_statement_report.py index 19ba2efe..c5f5f308 100644 --- a/account_statement_ext/report/bank_statement_report.py +++ b/account_statement_ext/report/bank_statement_report.py @@ -21,8 +21,7 @@ import time from report import report_sxw -from osv import osv -from tools.translate import _ +from openerp.tools.translate import _ import pooler from operator import add, itemgetter from itertools import groupby diff --git a/account_statement_ext/statement.py b/account_statement_ext/statement.py index b3c7c19f..ca8baaa5 100644 --- a/account_statement_ext/statement.py +++ b/account_statement_ext/statement.py @@ -20,8 +20,8 @@ ############################################################################## import time - -from openerp.osv.orm import Model, fields +from openerp.osv.orm import Model +from openerp.osv import fields from openerp.tools.translate import _ import openerp.addons.decimal_precision as dp diff --git a/account_statement_ext_voucher/statement_voucher.py b/account_statement_ext_voucher/statement_voucher.py index 7567e0ec..4e9ec9d2 100644 --- a/account_statement_ext_voucher/statement_voucher.py +++ b/account_statement_ext_voucher/statement_voucher.py @@ -18,8 +18,9 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv.orm import Model, fields +from openerp.osv.orm import Model +from openerp.osv import fields class AccountVoucher(Model): diff --git a/account_statement_transactionid_completion/statement.py b/account_statement_transactionid_completion/statement.py index d8cf1199..01093edc 100644 --- a/account_statement_transactionid_completion/statement.py +++ b/account_statement_transactionid_completion/statement.py @@ -19,11 +19,11 @@ # ############################################################################## -from tools.translate import _ +from openerp.tools.translate import _ import datetime import netsvc -logger = netsvc.Logger() -from openerp.osv.orm import Model, fields +from openerp.osv.orm import Model +from openerp.osv import fields from openerp.addons.account_statement_base_completion.statement import ErrorTooManyPartner class AccountStatementCompletionRule(Model): diff --git a/account_statement_transactionid_import/statement.py b/account_statement_transactionid_import/statement.py index 1163ae6d..c4ffa644 100644 --- a/account_statement_transactionid_import/statement.py +++ b/account_statement_transactionid_import/statement.py @@ -19,8 +19,8 @@ # ############################################################################## -from openerp.osv.orm import Model, fields -from openerp.osv import fields, osv +from openerp.osv.orm import Model +from openerp.osv import fields class AccountStatementProfil(Model): _inherit = "account.statement.profile" diff --git a/base_transaction_id/invoice.py b/base_transaction_id/invoice.py index 26a7f3ae..5fc944f7 100644 --- a/base_transaction_id/invoice.py +++ b/base_transaction_id/invoice.py @@ -19,10 +19,11 @@ # ############################################################################## -from osv import fields, osv -from tools.translate import _ +from openerp.osv.orm import Model +from openerp.osv import fields +from openerp.tools.translate import _ -class AccountInvoice(osv.osv): +class AccountInvoice(Model): _inherit = 'account.invoice' _columns = { 'transaction_id':fields.char( diff --git a/base_transaction_id/sale.py b/base_transaction_id/sale.py index 62330e2c..9b1155d3 100644 --- a/base_transaction_id/sale.py +++ b/base_transaction_id/sale.py @@ -19,9 +19,10 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv.orm import Model +from openerp.osv import fields -class SaleOrder(osv.osv): +class SaleOrder(Model): _inherit = 'sale.order' _columns = { 'transaction_id':fields.char('Transaction id', size=128,required=False, diff --git a/base_transaction_id/stock.py b/base_transaction_id/stock.py index f2b66f71..83ba6d6c 100644 --- a/base_transaction_id/stock.py +++ b/base_transaction_id/stock.py @@ -19,9 +19,10 @@ # ############################################################################## -from osv import osv +from openerp.osv.orm import Model +from openerp.osv import fields -class StockPicking(osv.osv): +class StockPicking(Model): _inherit = "stock.picking" def action_invoice_create(self, cursor, uid, ids, journal_id=False,