From a5979a9f4555c868ec0f55cedef453a7c45fc333 Mon Sep 17 00:00:00 2001 From: Joel Grand-Guillaume Date: Wed, 19 Dec 2012 14:14:59 +0100 Subject: [PATCH] [FIX] Import osv for osv.except --- account_advanced_reconcile/base_advanced_reconciliation.py | 2 +- account_easy_reconcile/base_reconciliation.py | 2 +- account_easy_reconcile/easy_reconcile.py | 2 +- account_statement_base_completion/partner.py | 2 +- account_statement_base_completion/statement.py | 2 +- account_statement_base_import/statement.py | 2 +- account_statement_base_import/wizard/import_statement.py | 2 +- account_statement_ext/account.py | 2 +- account_statement_ext/statement.py | 2 +- account_statement_ext_voucher/statement_voucher.py | 2 +- account_statement_transactionid_completion/statement.py | 2 +- account_statement_transactionid_import/statement.py | 2 +- base_transaction_id/invoice.py | 2 +- base_transaction_id/sale.py | 2 +- base_transaction_id/stock.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/account_advanced_reconcile/base_advanced_reconciliation.py b/account_advanced_reconcile/base_advanced_reconciliation.py index ebb048f7..4de33f09 100644 --- a/account_advanced_reconcile/base_advanced_reconciliation.py +++ b/account_advanced_reconcile/base_advanced_reconciliation.py @@ -22,7 +22,7 @@ from itertools import groupby, product from operator import itemgetter from openerp.osv.orm import Model, AbstractModel, TransientModel -from openerp.osv import fields +from openerp.osv import fields, osv class easy_reconcile_advanced(AbstractModel): diff --git a/account_easy_reconcile/base_reconciliation.py b/account_easy_reconcile/base_reconciliation.py index c1f4041c..b1134c55 100644 --- a/account_easy_reconcile/base_reconciliation.py +++ b/account_easy_reconcile/base_reconciliation.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import AbstractModel -from openerp.osv import fields +from openerp.osv import fields, osv from operator import itemgetter, attrgetter diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 6a2899cd..ec601ae4 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -21,7 +21,7 @@ import time from openerp.osv.orm import Model, AbstractModel -from openerp.osv import fields +from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT diff --git a/account_statement_base_completion/partner.py b/account_statement_base_completion/partner.py index aafb40f7..9c626292 100644 --- a/account_statement_base_completion/partner.py +++ b/account_statement_base_completion/partner.py @@ -20,7 +20,7 @@ ################################################################################# from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class res_partner(Model): diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py index abc65ee4..6c493c99 100644 --- a/account_statement_base_completion/statement.py +++ b/account_statement_base_completion/statement.py @@ -20,7 +20,7 @@ ############################################################################## from tools.translate import _ from openerp.osv.orm import Model, fields -from openerp.osv import fields, osv +from openerp.osv import fields, osv, osv from operator import itemgetter, attrgetter import datetime diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index ec88f0ef..02f0bd54 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -24,7 +24,7 @@ import datetime import netsvc logger = netsvc.Logger() from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv from parser import new_bank_statement_parser import sys import traceback diff --git a/account_statement_base_import/wizard/import_statement.py b/account_statement_base_import/wizard/import_statement.py index cb0e84b5..d8bf8527 100644 --- a/account_statement_base_import/wizard/import_statement.py +++ b/account_statement_base_import/wizard/import_statement.py @@ -24,7 +24,7 @@ Wizard to import financial institute date in bank statement """ from openerp.osv import osv, orm -from openerp.osv import fields +from openerp.osv import fields, osv from openerp.tools.translate import _ import os diff --git a/account_statement_ext/account.py b/account_statement_ext/account.py index dc907d32..d62bb379 100644 --- a/account_statement_ext/account.py +++ b/account_statement_ext/account.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class account_move(Model): diff --git a/account_statement_ext/statement.py b/account_statement_ext/statement.py index ca8baaa5..c9b42f3d 100644 --- a/account_statement_ext/statement.py +++ b/account_statement_ext/statement.py @@ -21,7 +21,7 @@ import time from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv, osv 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 4e9ec9d2..2a0c9eef 100644 --- a/account_statement_ext_voucher/statement_voucher.py +++ b/account_statement_ext_voucher/statement_voucher.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class AccountVoucher(Model): diff --git a/account_statement_transactionid_completion/statement.py b/account_statement_transactionid_completion/statement.py index 01093edc..df4715a9 100644 --- a/account_statement_transactionid_completion/statement.py +++ b/account_statement_transactionid_completion/statement.py @@ -23,7 +23,7 @@ from openerp.tools.translate import _ import datetime import netsvc from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv 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 c4ffa644..295b65d5 100644 --- a/account_statement_transactionid_import/statement.py +++ b/account_statement_transactionid_import/statement.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class AccountStatementProfil(Model): _inherit = "account.statement.profile" diff --git a/base_transaction_id/invoice.py b/base_transaction_id/invoice.py index 5fc944f7..032dce81 100644 --- a/base_transaction_id/invoice.py +++ b/base_transaction_id/invoice.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv from openerp.tools.translate import _ class AccountInvoice(Model): diff --git a/base_transaction_id/sale.py b/base_transaction_id/sale.py index 9b1155d3..ad593abf 100644 --- a/base_transaction_id/sale.py +++ b/base_transaction_id/sale.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class SaleOrder(Model): _inherit = 'sale.order' diff --git a/base_transaction_id/stock.py b/base_transaction_id/stock.py index 83ba6d6c..13dcd185 100644 --- a/base_transaction_id/stock.py +++ b/base_transaction_id/stock.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import fields, osv class StockPicking(Model): _inherit = "stock.picking"