[MIGR] Adapt import to fit last recomandation

This commit is contained in:
Joel Grand-Guillaume
2012-12-19 13:58:54 +01:00
parent d02d198b1b
commit 2ac95f1c44
13 changed files with 38 additions and 33 deletions

View File

@@ -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 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. this partner when we found this in a statement line.

View File

@@ -19,8 +19,6 @@
# #
############################################################################## ##############################################################################
from tools.translate import _ from tools.translate import _
import netsvc
logger = netsvc.Logger()
from openerp.osv.orm import Model, fields from openerp.osv.orm import Model, fields
from openerp.osv import fields, osv from openerp.osv import fields, osv
from operator import itemgetter, attrgetter from operator import itemgetter, attrgetter

View File

@@ -19,13 +19,12 @@
# #
############################################################################## ##############################################################################
from tools.translate import _ from openerp.tools.translate import _
import datetime import datetime
import netsvc import netsvc
logger = netsvc.Logger() logger = netsvc.Logger()
from openerp.osv.orm import Model, fields from openerp.osv.orm import Model
from openerp.osv import fields, osv from openerp.osv import fields
# from account_statement_base_import.parser.file_parser import FileParser
from parser import new_bank_statement_parser from parser import new_bank_statement_parser
import sys import sys
import traceback import traceback
@@ -71,8 +70,8 @@ class AccountStatementProfil(Model):
+ _("Bank Statement ID %s have been imported with %s lines ") %(statement_id, num_lines)] + _("Bank Statement ID %s have been imported with %s lines ") %(statement_id, num_lines)]
log = "\n".join(log_line) log = "\n".join(log_line)
self.write(cr, uid, id, {'rec_log' : log, 'last_import_date':import_date}, context=context) self.write(cr, uid, id, {'rec_log' : log, 'last_import_date':import_date}, context=context)
logger.notifyChannel('Bank Statement Import', netsvc.LOG_INFO, self.message_post(cr, uid, [statement_id], body=_('Statement ID %s have been imported with %s lines.')
"Bank Statement ID %s have been imported with %s lines "%(statement_id, num_lines)) % (statement_id,num_lines), context=context)
return True return True
def prepare_global_commission_line_vals(self, cr, uid, parser, def prepare_global_commission_line_vals(self, cr, uid, parser,

View File

@@ -23,11 +23,13 @@
Wizard to import financial institute date in bank statement Wizard to import financial institute date in bank statement
""" """
from osv import fields, osv from openerp.osv import osv, orm
from tools.translate import _ from openerp.osv import fields
from openerp.tools.translate import _
import os import os
class CreditPartnerStatementImporter(osv.osv_memory): class CreditPartnerStatementImporter(orm.TransientModel):
_name = "credit.statement.import" _name = "credit.statement.import"
def default_get(self, cr, uid, fields, context=None): def default_get(self, cr, uid, fields, context=None):

View File

@@ -18,9 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
import netsvc
logger = netsvc.Logger() from openerp.osv.orm import Model
from openerp.osv.orm import Model, fields from openerp.osv import fields
class account_move(Model): class account_move(Model):
_inherit='account.move' _inherit='account.move'

View File

@@ -21,8 +21,7 @@
import time import time
from report import report_sxw from report import report_sxw
from osv import osv from openerp.tools.translate import _
from tools.translate import _
import pooler import pooler
from operator import add, itemgetter from operator import add, itemgetter
from itertools import groupby from itertools import groupby

View File

@@ -20,8 +20,8 @@
############################################################################## ##############################################################################
import time import time
from openerp.osv.orm import Model
from openerp.osv.orm import Model, fields from openerp.osv import fields
from openerp.tools.translate import _ from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp import openerp.addons.decimal_precision as dp

View File

@@ -18,8 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
from openerp.osv.orm import Model, fields
from openerp.osv.orm import Model
from openerp.osv import fields
class AccountVoucher(Model): class AccountVoucher(Model):

View File

@@ -19,11 +19,11 @@
# #
############################################################################## ##############################################################################
from tools.translate import _ from openerp.tools.translate import _
import datetime import datetime
import netsvc import netsvc
logger = netsvc.Logger() from openerp.osv.orm import Model
from openerp.osv.orm import Model, fields from openerp.osv import fields
from openerp.addons.account_statement_base_completion.statement import ErrorTooManyPartner from openerp.addons.account_statement_base_completion.statement import ErrorTooManyPartner
class AccountStatementCompletionRule(Model): class AccountStatementCompletionRule(Model):

View File

@@ -19,8 +19,8 @@
# #
############################################################################## ##############################################################################
from openerp.osv.orm import Model, fields from openerp.osv.orm import Model
from openerp.osv import fields, osv from openerp.osv import fields
class AccountStatementProfil(Model): class AccountStatementProfil(Model):
_inherit = "account.statement.profile" _inherit = "account.statement.profile"

View File

@@ -19,10 +19,11 @@
# #
############################################################################## ##############################################################################
from osv import fields, osv from openerp.osv.orm import Model
from tools.translate import _ from openerp.osv import fields
from openerp.tools.translate import _
class AccountInvoice(osv.osv): class AccountInvoice(Model):
_inherit = 'account.invoice' _inherit = 'account.invoice'
_columns = { _columns = {
'transaction_id':fields.char( 'transaction_id':fields.char(

View File

@@ -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' _inherit = 'sale.order'
_columns = { _columns = {
'transaction_id':fields.char('Transaction id', size=128,required=False, 'transaction_id':fields.char('Transaction id', size=128,required=False,

View File

@@ -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" _inherit = "stock.picking"
def action_invoice_create(self, cursor, uid, ids, journal_id=False, def action_invoice_create(self, cursor, uid, ids, journal_id=False,