From 759416678b33a0caa5377f89b04b8acfc449c0b0 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 30 Nov 2012 15:57:14 +0100 Subject: [PATCH 01/32] [FIX]Currency constraint bzr revid: dle@openerp.com-20121130145714-d5k3cn95vh7nlc10 --- addons/l10n_be_coda/l10n_be_coda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index 1dab4ab1964..289e757a80d 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -30,7 +30,7 @@ class coda_bank_account(osv.osv): def _check_currency(self, cr, uid, ids, context=None): obj_cba = self.browse(cr, uid, ids[0], context=context) - if (obj_cba.state == 'normal') and obj_cba.journal and (obj_cba.currency != obj_cba.journal.currency): + if (obj_cba.state == 'normal') and obj_cba.journal and (obj_cba.currency != obj_cba.journal.currency and (not obj_cba.journal.currency and obj_cba.currency != obj_cba.company_id.currency_id)): return False return True From 6f3f1d4217abc1f14adb1e4dffd00da04516e5ab Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 30 Nov 2012 18:20:33 +0100 Subject: [PATCH 02/32] [MERGE](Sort of :D)From Luc De Meyer Zip from apps.openerp.com bzr revid: dle@openerp.com-20121130172033-dinqyw8arg79eh31 --- addons/l10n_be_coda/l10n_be_coda.py | 269 +-- addons/l10n_be_coda/l10n_be_coda_view.xml | 169 +- addons/l10n_be_coda/res_bank.py | 33 + addons/l10n_be_coda/res_bank_view.xml | 31 + .../wizard/account_coda_import.py | 1545 +++++++++++++---- 5 files changed, 1577 insertions(+), 470 deletions(-) create mode 100755 addons/l10n_be_coda/res_bank.py create mode 100755 addons/l10n_be_coda/res_bank_view.xml diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index 289e757a80d..f9dfa3a686a 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# -# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# +# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -23,20 +23,29 @@ from osv import osv, fields import decimal_precision as dp from tools.translate import _ +import logging +_logger = logging.getLogger(__name__) class coda_bank_account(osv.osv): _name= 'coda.bank.account' _description= 'CODA Bank Account Configuration' + def _check_account_pain(self, cr, uid, context=None): + res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_pain'), ('state','=','installed')]) + return res and True or False + def _check_currency(self, cr, uid, ids, context=None): obj_cba = self.browse(cr, uid, ids[0], context=context) - if (obj_cba.state == 'normal') and obj_cba.journal and (obj_cba.currency != obj_cba.journal.currency and (not obj_cba.journal.currency and obj_cba.currency != obj_cba.company_id.currency_id)): - return False + if (obj_cba.state == 'normal') and obj_cba.journal: + if obj_cba.journal.currency and (obj_cba.currency != obj_cba.journal.currency): + return False + if not obj_cba.journal.currency and (obj_cba.currency != obj_cba.company_id.currency_id): + return False return True _columns = { 'name': fields.char('Name', size=64, required=True), - 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True, + 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True, help='Bank Account Number.\nThe CODA import function will find its CODA processing parameters on this number.'), 'description1': fields.char('Primary Account Description', size=35, help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), @@ -44,34 +53,47 @@ class coda_bank_account(osv.osv): help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), 'state': fields.selection([ ('normal', 'Normal'), - ('info', 'Info')], + ('info', 'Info')], 'Type', required=True, select=1, help='No Bank Statements will be generated for CODA Bank Statements from Bank Accounts of type \'Info\'.'), - 'journal': fields.many2one('account.journal', 'Journal', - domain=[('type', '=', 'bank')], + 'journal': fields.many2one('account.journal', 'Journal', + domain=[('type', '=', 'bank')], states={'normal':[('required',True)],'info':[('required',False)]}, help='Bank Journal for the Bank Statement'), 'currency': fields.many2one('res.currency', 'Currency', required=True, - help='The currency of the CODA Bank Statement'), + help='The currency of the CODA Bank Statement'), 'coda_st_naming': fields.char('Bank Statement Naming Policy', size=64, help="Define the rules to create the name of the Bank Statements generated by the CODA processing." \ - "\nE.g. %(code)s%(y)s/%(paper)s" + "\nE.g. %(code)s%(y)s/%(paper)s" \ "\n\nVariables:" \ "\nBank Journal Code: %(code)s" \ - "\nCurrent Year with Century: %(year)s" \ - "\nCurrent Year without Century: %(y)s" \ + "\nYear (of CODA 'New Balance Date') with Century: %(year)s" \ + "\nYear (of CODA 'New Balance Date') without Century: %(y)s" \ "\nCODA sequence number: %(coda)s" \ - "\nPaper Statement sequence number: %(paper)s"), - 'def_payable': fields.many2one('account.account', 'Default Payable Account', domain=[('type', '=', 'payable')], required=True, - help= 'Set here the payable account that will be used, by default, if the partner is not found.'), - 'def_receivable': fields.many2one('account.account', 'Default Receivable Account', domain=[('type', '=', 'receivable')], required=True, - help= 'Set here the receivable account that will be used, by default, if the partner is not found.',), + "\nPaper Statement sequence number (as specified on 'Old Balance' record): %(paper_ob)s" \ + "\nPaper Statement sequence number (as specified on 'New Balance' record): %(paper)s"), 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', domain=[('type', '!=', 'view')], required=True, help= 'Set here the default account that will be used if the partner cannot be unambiguously identified.'), 'transfer_account': fields.many2one('account.account', 'Default Internal Transfer Account', domain=[('code', 'like', '58%'), ('type', '!=', 'view')], required=True, help= 'Set here the default account that will be used for internal transfer between own bank accounts (e.g. transfer between current and deposit bank accounts).'), - 'find_bbacom': fields.boolean('Lookup Invoice', required=True, help='Partner lookup via the \'BBA\' Structured Communication field of the Invoice.'), - 'find_partner': fields.boolean('Lookup Partner', required=True, help='Partner lookup via Bank Account Number.'), + 'account_mapping_ids': fields.one2many('coda.account.mapping.rule', 'coda_bank_account_id', 'Account Mapping Rules'), + 'find_payment': fields.boolean('Lookup Payment Reference', + help='Invoice lookup and reconciliation via the SEPA EndToEndReference.' \ + '\nInstall the \'account_pain\' module if you want to take advantage of this feature.'), + 'find_bbacom': fields.boolean('Lookup Structured Communication of type \'BBA\'', + help='Partner lookup and reconciliation via the \'BBA\' Structured Communication.' \ + '\nA partial reconciliation will be created when there is no exact match between the Invoice and Bank Transaction amounts.'), + 'find_inv_number': fields.boolean('Lookup Invoice Number', + help='Partner lookup and reconciliation via the Invoice Number when a communication in free format is used.' \ + '\nA reconciliation will only be created in case of exact match between the Invoice and Bank Transaction amounts.'), + 'find_partner': fields.boolean('Lookup Partner', + help='Partner lookup via Bank Account Number in order to facilitate the reconciliation.'), + 'update_partner': fields.boolean('Update Partner Bank Accounts', + help='Update Partner record when the Counterparty\'s Bank Account has not been registered yet.'), + 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', + help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), + 'discard_dup': fields.boolean('Discard Duplicates', + help="Duplicate Bank Statements will be discarded. Select the corresponding 'CODA Bank Statement' in order to view the contents of such duplicates."), 'active': fields.boolean('Active', help='If the active field is set to False, it will allow you to hide the Bank Account without removing it.'), 'company_id': fields.many2one('res.company', 'Company', required=True), } @@ -79,9 +101,13 @@ class coda_bank_account(osv.osv): 'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, 'state': 'normal', 'coda_st_naming': '%(code)s/%(y)s/%(coda)s', - 'active': True, + 'active': True, + 'find_payment': _check_account_pain, 'find_bbacom': True, - 'find_partner': True, + 'find_inv_number': True, + 'find_partner': True, + 'update_partner': True, + 'balance_start_enforce': True, 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } _sql_constraints = [ @@ -107,19 +133,20 @@ class coda_bank_account(osv.osv): if not default: default = {} default = default.copy() - default.update( - journal_id=None, - description1=cba['description1'] or '', - description2=cba['description2'] or '', - name=_("%s (copy)") % (cba['name'] or ''), - state=cba['state']) - return super(coda_bank_account, self).copy(cr, uid, id, default, context) + default.update({'journal_id': None}) + default['description1'] = cba['description1'] or '' + default['description2'] = cba['description2'] or '' + default['name'] = (cba['name'] or '') + ' (copy)' + default['state'] = cba['state'] + return super(coda_bank_account, self).copy(cr, uid, id, default, context) def onchange_state(self, cr, uid, ids, state): return state =='info' and {'value': {'journal': None}} or {} coda_bank_account() + + class account_coda(osv.osv): _name = 'account.coda' _description = 'Object to store CODA Data Files' @@ -138,10 +165,10 @@ class account_coda(osv.osv): 'date': fields.date.context_today, 'user_id': lambda self,cr,uid,context: uid, 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c), - } + } _sql_constraints = [ ('coda_uniq', 'unique (name, coda_creation_date)', 'This CODA has already been imported !') - ] + ] def unlink(self, cr, uid, ids, context=None): if context is None: @@ -150,79 +177,73 @@ class account_coda(osv.osv): coda_st_obj = self.pool.get('coda.bank.statement') bank_st_obj = self.pool.get('account.bank.statement') for coda in self.browse(cr, uid, ids, context=context): - for coda_statement in coda.statement_ids: + for coda_statement in coda.statement_ids: if not context.get('coda_statement_unlink', False): if coda_st_obj.exists(cr, uid, coda_statement.id, context=context): - coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context) + coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context) if not context.get('bank_statement_unlink', False): if coda_st_obj.exists(cr, uid, coda_statement.id, context=context) and (coda_statement.type == 'normal') and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) + bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) context.update({'coda_unlink': False}) return super(account_coda, self).unlink(cr, uid, ids, context=context) - + account_coda() -class account_coda_trans_type(osv.osv): +class account_coda_trans_type(osv.osv): _name = 'account.coda.trans.type' _description = 'CODA transaction type' - _rec_name = 'type' + _rec_name = 'type' _columns = { 'type': fields.char('Transaction Type', size=1, required=True), 'parent_id': fields.many2one('account.coda.trans.type', 'Parent'), 'description': fields.text('Description', translate=True), } - account_coda_trans_type() -class account_coda_trans_code(osv.osv): +class account_coda_trans_code(osv.osv): _name = 'account.coda.trans.code' _description = 'CODA transaction code' - _rec_name = 'code' + _rec_name = 'code' _columns = { 'code': fields.char('Code', size=2, required=True, select=1), 'type': fields.selection([ ('code', 'Transaction Code'), - ('family', 'Transaction Family')], - 'Type', required=True, select=1), + ('family', 'Transaction Family')], + 'Type', required=True, select=1), 'parent_id': fields.many2one('account.coda.trans.code', 'Family', select=1), 'description': fields.char('Description', size=128, translate=True, select=2), 'comment': fields.text('Comment', translate=True), } - account_coda_trans_code() -class account_coda_trans_category(osv.osv): +class account_coda_trans_category(osv.osv): _name = 'account.coda.trans.category' _description = 'CODA transaction category' - _rec_name = 'category' + _rec_name = 'category' _columns = { 'category': fields.char('Transaction Category', size=3, required=True), 'description': fields.char('Description', size=256, translate=True), } - account_coda_trans_category() -class account_coda_comm_type(osv.osv): +class account_coda_comm_type(osv.osv): _name = 'account.coda.comm.type' _description = 'CODA structured communication type' - _rec_name = 'code' + _rec_name = 'code' _columns = { 'code': fields.char('Structured Communication Type', size=3, required=True, select=1), 'description': fields.char('Description', size=128, translate=True), } _sql_constraints = [ ('code_uniq', 'unique (code)','The Structured Communication Code must be unique !') - ] - + ] account_coda_comm_type() class coda_bank_statement(osv.osv): - _name = 'coda.bank.statement' - _description = 'CODA Bank Statement' - - def _default_journal_id(self, cr, uid, context=None): - if context is None: - context = {} + _name = 'coda.bank.statement' + _description = 'CODA Bank Statement' + + def _default_journal_id(self, cr, uid, context={}): if context.get('journal_id', False): return context['journal_id'] return False @@ -238,7 +259,7 @@ class coda_bank_statement(osv.osv): res[r] = round(res[r], 2) return res - def _get_period(self, cr, uid, context=None): + def _get_period(self, cr, uid, context={}): periods = self.pool.get('account.period').find(cr, uid) if periods: return periods[0] @@ -249,19 +270,22 @@ class coda_bank_statement(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True, readonly=True), 'date': fields.date('Date', required=True, readonly=True), + 'coda_creation_date': fields.date('CODA Creation Date', readonly=True), + 'old_balance_date': fields.date('Old Balance Date', readonly=True), + 'new_balance_date': fields.date('New Balance Date', readonly=True), 'coda_id': fields.many2one('account.coda', 'CODA Data File', ondelete='cascade'), 'type': fields.selection([ ('normal', 'Normal'), - ('info', 'Info')], + ('info', 'Info')], 'Type', required=True, readonly=True, help='No Bank Statements are associated with CODA Bank Statements of type \'Info\'.'), - 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'), + 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, domain=[('type', '=', 'bank')]), - 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True), + 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True), 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True), 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'), readonly=True), 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), readonly=True), - 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'), + 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'), 'line_ids': fields.one2many('coda.bank.statement.line', 'statement_id', 'CODA Bank Statement lines', readonly=True), 'currency': fields.many2one('res.currency', 'Currency', required=True, readonly=True, @@ -269,14 +293,14 @@ class coda_bank_statement(osv.osv): 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { - 'type': 'normal', + 'type': 'normal', 'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, 'journal_id': _default_journal_id, 'period_id': _get_period, } def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): - if context is None: + if context is None: context = {} res = super(coda_bank_statement, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) @@ -290,20 +314,20 @@ class coda_bank_statement(osv.osv): context.update({'coda_statement_unlink': True}) coda_obj = self.pool.get('account.coda') bank_st_obj = self.pool.get('account.bank.statement') - + # find all CODA bank statements that are associated with the selected CODA bank statements via a common CODA file - new_ids = [] + new_ids = [] for coda_statement in self.browse(cr, uid, ids, context=context): if coda_obj.exists(cr, uid, coda_statement.coda_id.id, context=context): new_ids += [x.id for x in coda_obj.browse(cr, uid, coda_statement.coda_id.id, context=context).statement_ids] - # unlink CODA banks statements as well as associated bank statements and CODA files + # unlink CODA banks statements as well as associated bank statements and CODA files for coda_statement in self.browse(cr, uid, new_ids, context=context): - if coda_statement.statement_id.state == 'confirm': - raise osv.except_osv(_('Invalid Action!'), - _("Cannot delete CODA Bank Statement '%s' of journal '%s'." \ - "\nThe associated Bank Statement has already been confirmed." \ - "\nPlease undo this action first.") \ + if coda_statement.statement_id.state == 'confirm': + raise osv.except_osv(_('Invalid action !'), + _("Cannot delete CODA Bank Statement '%s' of Journal '%s'." \ + "\nThe associated Bank Statement has already been confirmed !" \ + "\nPlease undo this action first!") \ % (coda_statement.name, coda_statement.journal_id.name)) else: if not context.get('coda_unlink', False): @@ -311,11 +335,11 @@ class coda_bank_statement(osv.osv): coda_obj.unlink(cr, uid, [coda_statement.coda_id.id], context=context) if not context.get('bank_statement_unlink', False): if coda_statement.statement_id and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) + bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) context.update({'coda_statement_unlink': False}) return super(coda_bank_statement, self).unlink(cr, uid, new_ids, context=context) - + coda_bank_statement() class account_bank_statement(osv.osv): @@ -323,7 +347,10 @@ class account_bank_statement(osv.osv): _columns = { 'coda_statement_id': fields.many2one('coda.bank.statement', 'Associated CODA Bank Statement'), } - + _sql_constraints = [ + ('name_company_uniq', 'unique (name,company_id)', 'The name of the Bank Statement must be unique per company !') + ] + def unlink(self, cr, uid, ids, context=None): if context is None: context = {} @@ -332,15 +359,15 @@ class account_bank_statement(osv.osv): coda_st_obj = self.pool.get('coda.bank.statement') # find all statements that are associated with the selected bank statements via a common CODA file - ids_plus = [] + ids_plus = [] for statement in self.browse(cr, uid, ids, context=context): if statement.coda_statement_id: for x in coda_obj.browse(cr, uid, statement.coda_statement_id.coda_id.id, context=context).statement_ids: if x.type == 'normal': ids_plus += [x.statement_id.id] - + # unlink banks statements as well as associated CODA bank statements and CODA files - for statement in self.browse(cr, uid, ids_plus, context=context): + for statement in self.browse(cr, uid, ids_plus, context=context): if not context.get('coda_statement_unlink', False): if statement.coda_statement_id and coda_st_obj.exists(cr, uid, statement.coda_statement_id.id, context=context): coda_st_obj.unlink(cr, uid, [statement.coda_statement_id.id], context=context) @@ -354,63 +381,109 @@ class account_bank_statement(osv.osv): context.update({'bank_statement_unlink': False}) new_ids = list(set(ids + ids_plus)) return super(account_bank_statement, self).unlink(cr, uid, new_ids, context=context) - + account_bank_statement() class coda_bank_statement_line(osv.osv): - _name = 'coda.bank.statement.line' - _order = 'sequence' + _name = 'coda.bank.statement.line' + _order = 'sequence' _description = 'CODA Bank Statement Line' _columns = { 'name': fields.char('Communication', size=268, required=True), 'sequence': fields.integer('Sequence'), 'date': fields.date('Entry Date', required=True), - 'val_date': fields.date('Valuta Date'), - 'account_id': fields.many2one('account.account','Account'), # remove required=True + 'val_date': fields.date('Valuta Date'), + 'account_id': fields.many2one('account.account','Account'), 'type': fields.selection([ ('supplier','Supplier'), ('customer','Customer'), ('general','General'), - ('globalisation','Globalisation'), - ('information','Information'), - ('communication','Free Communication'), + ('globalisation','Globalisation'), + ('information','Information'), + ('communication','Free Communication'), ], 'Type', required=True), - 'globalisation_level': fields.integer('Globalisation Level', - help="The value which is mentioned (1 to 9), specifies the hierarchy level" - " of the globalisation of which this record is the first." - "\nThe same code will be repeated at the end of the globalisation."), - 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')), + 'globalisation_level': fields.integer('Globalisation Level', + help="The value which is mentioned (1 to 9), specifies the hierarchy level" + " of the globalisation of which this record is the first." + "\nThe same code will be repeated at the end of the globalisation."), + 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')), 'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID', readonly=True, - help="Code to identify transactions belonging to the same globalisation level within a batch payment"), + help="Code to identify transactions belonging to the same globalisation level within a batch payment"), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'partner_id': fields.many2one('res.partner', 'Partner'), 'counterparty_name': fields.char('Counterparty Name', size=35), - 'counterparty_bic': fields.char('Counterparty BIC', size=11), - 'counterparty_number': fields.char('Counterparty Number', size=34), - 'counterparty_currency': fields.char('Counterparty Currency', size=3), + 'counterparty_bic': fields.char('Counterparty BIC', size=11), + 'counterparty_number': fields.char('Counterparty Number', size=34), + 'counterparty_currency': fields.char('Counterparty Currency', size=3), + 'payment_reference': fields.char('Payment Reference', size=35, + help="Payment Reference. For SEPA (SCT or SDD) transactions, the PaymentInformationIdentification "\ + "is recorded in this field pertaining to a globalisation, and the EndToEndReference for " \ + "simple transactions or for the details of a globalisation."), 'statement_id': fields.many2one('coda.bank.statement', 'CODA Bank Statement', select=True, required=True, ondelete='cascade'), 'coda_bank_account_id': fields.related('statement_id', 'coda_bank_account_id', type='many2one', relation='coda.bank.account', string='Bank Account', store=True, readonly=True), 'ref': fields.char('Reference', size=32), 'note': fields.text('Notes'), - 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), + 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } def unlink(self, cr, uid, ids, context=None): if context is None: context = {} if context.get('block_statement_line_delete', False): - raise osv.except_osv('Warning', _('Delete operation not allowed.')) + raise osv.except_osv('Warning', _('Delete operation not allowed !')) return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context) -coda_bank_statement_line() +coda_bank_statement_line() class account_bank_statement_line_global(osv.osv): _inherit = 'account.bank.statement.line.global' _columns = { 'coda_statement_line_ids': fields.one2many('coda.bank.statement.line', 'globalisation_id', 'CODA Bank Statement Lines', readonly=True), } - account_bank_statement_line_global() +class coda_account_mapping_rule(osv.osv): + _name = 'coda.account.mapping.rule' + _description = 'Rules Engine to assign accounts during CODA parsing' + _order = 'sequence' + _columns = { + 'coda_bank_account_id': fields.many2one('coda.bank.account', 'CODA Bank Account', ondelete='cascade'), + 'sequence': fields.integer('Sequence', help='Determines the order of the rules to assign accounts'), + 'name': fields.char('Rule Name', size=128, required=True), + # matching criteria + 'trans_type_id': fields.many2one('account.coda.trans.type', 'Transaction Type'), + 'trans_family_id': fields.many2one('account.coda.trans.code', 'Transaction Family', domain=[('type', '=', 'family')]), + 'trans_code_id': fields.many2one('account.coda.trans.code', 'Transaction Code', domain=[('type', '=', 'code')]), + 'trans_category_id': fields.many2one('account.coda.trans.category', 'Transaction Category'), + 'struct_comm_type_id': fields.many2one('account.coda.comm.type', 'Structured Communication Type'), + 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'), + # resulting general account + 'account_id': fields.many2one('account.account', 'Account', ondelete='cascade', required=True, domain=[('type', '!=', 'view')]), + 'active': fields.boolean('Active', help='Switch on/off this rule.'), + } + _defaults = { + 'active': True, + } + + def account_id_get(self, cr, uid, coda_bank_account_id, trans_type_id=None, trans_family_id=None, + trans_code_id=None, trans_category_id=None, struct_comm_type_id=None, partner_id=None, context=None): + cr.execute('SELECT account_id, trans_type_id, trans_family_id, trans_code_id, trans_category_id, struct_comm_type_id, partner_id ' \ + 'FROM coda_account_mapping_rule ' \ + 'WHERE active = TRUE AND coda_bank_account_id = %s ' \ + 'ORDER BY sequence' % coda_bank_account_id + ) + rules = cr.fetchall() + condition = '(not rule[1] or (trans_type_id == rule[1])) and (not rule[2] or (trans_family_id == rule[2])) ' \ + 'and (not rule[3] or (trans_code_id == rule[3])) and (not rule[4] or (trans_category_id == rule[4])) ' \ + 'and (not rule[5] or (struct_comm_type_id == rule[5])) and (not rule[6] or (partner_id == rule[6]))' + account_id = None + for rule in rules: + if eval(condition): + account_id = rule[0] + break + return account_id + +coda_account_mapping_rule() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 1f014400d3c..fb0a12b73fb 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -11,10 +11,11 @@ coda.bank.account - + + @@ -54,15 +55,52 @@ - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ @@ -282,11 +320,12 @@ coda.bank.statement.list coda.bank.statement - + - - + + + @@ -299,61 +338,56 @@ coda.bank.statement.form coda.bank.statement -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -362,10 +396,12 @@ coda.bank.statement - - + + + + @@ -457,6 +493,7 @@ + diff --git a/addons/l10n_be_coda/res_bank.py b/addons/l10n_be_coda/res_bank.py new file mode 100755 index 00000000000..6a3581539e9 --- /dev/null +++ b/addons/l10n_be_coda/res_bank.py @@ -0,0 +1,33 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class res_bank(osv.osv): + _inherit = 'res.bank' + _columns = { + 'code': fields.char('Code', size=3, + help='Country specific Bank Code (used for bban to iban conversion).'), + } +res_bank() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/res_bank_view.xml b/addons/l10n_be_coda/res_bank_view.xml new file mode 100755 index 00000000000..fe4a71d2bdb --- /dev/null +++ b/addons/l10n_be_coda/res_bank_view.xml @@ -0,0 +1,31 @@ + + + + + + res.bank.form.add.code + res.bank + + form + + + + + + + + + res.bank.tree.add.code + res.bank + + form + + + + + + + + + + diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 46c545f0f48..6f055ca3d92 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# -# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# +# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -24,11 +24,11 @@ import time import base64 from osv import fields,osv from tools.translate import _ -import logging +import netsvc import re from traceback import format_exception from sys import exc_info -from base_iban import base_iban +import logging _logger = logging.getLogger(__name__) class account_coda_import(osv.osv_memory): @@ -43,6 +43,10 @@ class account_coda_import(osv.osv_memory): 'coda_fname': lambda *a: '', } + def _check_account_payment(self, cr, uid, context=None): + res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_payment'), ('state','=','installed')]) + return res and True or False + def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None): if context is None: context = {} @@ -53,12 +57,12 @@ class account_coda_import(osv.osv_memory): data=self.browse(cr,uid,ids)[0] try: codafile = data.coda_data - codafilename = data.coda_fname + codafilename = data.coda_fname except: - raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button.')) + raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) return {} - currency_obj = self.pool.get('res.currency') + currency_obj = self.pool.get('res.currency') coda_bank_account_obj = self.pool.get('coda.bank.account') trans_type_obj = self.pool.get('account.coda.trans.type') trans_code_obj = self.pool.get('account.coda.trans.code') @@ -80,13 +84,23 @@ class account_coda_import(osv.osv_memory): voucher_line_obj = self.pool.get('account.voucher.line') seq_obj = self.pool.get('ir.sequence') mod_obj = self.pool.get('ir.model.data') + partner_obj = self.pool.get('res.partner') + account_mapping_obj = self.pool.get('coda.account.mapping.rule') + + if self._check_account_payment(cr, uid): + payment_line_obj = self.pool.get('payment.line') + else: + payment_line_obj = False + + wf_service = netsvc.LocalService('workflow') + be_country_id = self.pool.get('res.country').search(cr, uid, [('code', '=', 'BE')])[0] coda_bank_table = coda_bank_account_obj.read(cr, uid, coda_bank_account_obj.search(cr, uid, []), context=context) for coda_bank in coda_bank_table: coda_bank.update({'journal_code': coda_bank['journal'] and journal_obj.browse(cr, uid, coda_bank['journal'][0], context=context).code or ''}) coda_bank.update({'iban': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).iban}) coda_bank.update({'acc_number': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).acc_number}) - coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name}) + coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name}) trans_type_table = trans_type_obj.read(cr, uid, trans_type_obj.search(cr, uid, []), context=context) trans_code_table = trans_code_obj.read(cr, uid, trans_code_obj.search(cr, uid, []), context=context) trans_category_table = trans_category_obj.read(cr, uid, trans_category_obj.search(cr, uid, []), context=context) @@ -97,9 +111,10 @@ class account_coda_import(osv.osv_memory): err_log = '' coda_statements = [] recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') - + digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') + for line in recordlist: - + if not line: pass elif line[0] == '0': @@ -108,42 +123,35 @@ class account_coda_import(osv.osv_memory): coda_parsing_note = '' coda_statement_lines = {} st_line_seq = 0 - glob_lvl_stack = [0] # header data - coda_statement['currency'] = 'EUR' # default currency + coda_statement['currency'] = 'EUR' # default currency coda_statement['version'] = line[127] coda_version = line[127] if coda_version not in ['1','2']: - err_string = _('\nCODA V%s statements are not supported, please contact your bank.') % coda_version + err_string = _('\nCODA V%s statements are not supported, please contact your bank!') % coda_version err_code = 'R0001' if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) coda_statement['coda_statement_lines'] = {} coda_statement['date'] = str2date(line[5:11]) - period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['date']), ('date_stop','>=',coda_statement['date'])]) - if not period_id: - err_string = _("\nThe CODA creation date doesn't fall within a defined Accounting Period." \ - "\nPlease create the Accounting Period for date %s.") % coda_statement['date'] - err_code = 'R0002' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - coda_statement['period_id'] = period_id[0] + coda_statement['coda_creation_date'] = str2date(line[5:11]) + coda_statement['separate_application'] = line[83:88] + coda_statement['first_transaction_date'] = False coda_statement['state'] = 'draft' - + coda_id = coda_obj.search(cr, uid,[ ('name', '=', codafilename), ('coda_creation_date', '=', coda_statement['date']), ]) if coda_id: - err_string = _("\nCODA File with Filename '%s' and Creation Date '%s' has already been imported.") \ + err_string = _("\nCODA File with Filename '%s' and Creation Date '%s' has already been imported !") \ % (codafilename, coda_statement['date']) err_code = 'W0001' if batch: return (err_code, err_string) - raise osv.except_osv(_('Warning!'), err_string) - + raise osv.except_osv(_('Warning !'), err_string) + elif line[0] == '1': if coda_version == '1': coda_statement['acc_number'] = line[5:17] @@ -151,47 +159,56 @@ class account_coda_import(osv.osv_memory): coda_statement['currency'] = line[18:21] elif line[1] == '0': # Belgian bank account BBAN structure coda_statement['acc_number'] = line[5:17] - coda_statement['currency'] = line[18:21] + coda_statement['currency'] = line[18:21] elif line[1] == '1': # foreign bank account BBAN structure - err_string = _('\nForeign bank accounts with BBAN structure are not supported.') + err_string = _('\nForeign bank accounts with BBAN structure are not supported !') err_code = 'R1001' if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) elif line[1] == '2': # Belgian bank account IBAN structure - coda_statement['acc_number']=line[5:21] + coda_statement['acc_number']=line[5:21] coda_statement['currency'] = line[39:42] elif line[1] == '3': # foreign bank account IBAN structure - err_string = _('\nForeign bank accounts with IBAN structure are not supported.') + err_string = _('\nForeign bank accounts with IBAN structure are not supported !') err_code = 'R1002' if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) else: - err_string = _('\nUnsupported bank account structure.') + err_string = _('\nUnsupported bank account structure !') err_code = 'R1003' if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) coda_statement['description'] = line[90:125].strip() - cba_filter = lambda x: ((coda_statement['acc_number'] in (x['iban'] or '')) or (coda_statement['acc_number'] == x['acc_number'])) \ - and (coda_statement['currency'] == x['currency_name']) and (coda_statement['description'] == (x['description1'] or x['description2'] or '')) + cba_filter = lambda x: (coda_statement['acc_number'] in _get_acc_numbers(x['acc_number'])) \ + and (coda_statement['currency'] == x['currency_name']) and (coda_statement['description'] in [x['description1'] or '', x['description2'] or '']) coda_bank = filter(cba_filter, coda_bank_table) if coda_bank: - coda_bank = coda_bank[0] + coda_bank = coda_bank[0] coda_statement['type'] = coda_bank['state'] coda_statement['journal_id'] = coda_bank['journal'] and coda_bank['journal'][0] coda_statement['currency_id'] = coda_bank['currency'][0] - coda_statement['coda_bank_account_id'] = coda_bank['id'] - def_pay_acc = coda_bank['def_payable'][0] - def_rec_acc = coda_bank['def_receivable'][0] + coda_statement['coda_bank_account_id'] = coda_bank['id'] + coda_statement['account_mapping_ids'] = coda_bank['account_mapping_ids'] + coda_statement['coda_bank_params'] = coda_bank awaiting_acc = coda_bank['awaiting_account'][0] transfer_acc = coda_bank['transfer_account'][0] + find_payment = coda_bank['find_payment'] find_bbacom = coda_bank['find_bbacom'] + find_inv_number = coda_bank['find_inv_number'] find_partner = coda_bank['find_partner'] + update_partner = coda_bank['update_partner'] + coda_statement['balance_start_enforce'] = coda_bank['balance_start_enforce'] + coda_statement['discard_dup'] = coda_bank['discard_dup'] + company_id = coda_bank['company_id'][0] + company_bank_ids = partner_bank_obj.search(cr, uid, [('company_id', '=', company_id)]) + company_bank_accounts = partner_bank_obj.read(cr, uid, company_bank_ids, ['acc_number']) + company_bank_accounts = [x['acc_number'].replace(' ', '') for x in company_bank_accounts] else: - err_string = _("\nNo matching CODA Bank Account Configuration record found.") + \ - _("\nPlease check if the 'Bank Account Number', 'Currency' and 'Account Description' fields of your configuration record match with '%s', '%s' and '%s'.") \ + err_string = _("\nNo matching CODA Bank Account Configuration record found !") + \ + _("\nPlease check if the 'Bank Account Number', 'Currency' and 'Account Description' fields of your configuration record match with '%s', '%s' and '%s' !") \ % (coda_statement['acc_number'], coda_statement['currency'], coda_statement['description']) err_code = 'R1004' if batch: @@ -200,56 +217,72 @@ class account_coda_import(osv.osv_memory): bal_start = list2float(line[43:58]) # old balance data if line[42] == '1': # 1= Debit bal_start = - bal_start - coda_statement['balance_start'] = bal_start + coda_statement['balance_start'] = bal_start + coda_statement['old_balance_date'] = str2date(line[58:64]) coda_statement['acc_holder'] = line[64:90] - coda_statement['paper_seq_number'] = line[2:5] + coda_statement['paper_ob_seq_number'] = line[2:5] coda_statement['coda_seq_number'] = line[125:128] - if coda_bank['coda_st_naming']: - coda_statement['name'] = coda_bank['coda_st_naming'] % { - 'code': coda_bank['journal_code'] or '', - 'year': time.strftime('%Y'), - 'y': time.strftime('%y'), - 'coda': line[125:128], - 'paper': line[2:5], - } - else: - coda_statement['name'] = '/' elif line[0] == '2': # movement data record 2 + if line[1] == '1': # movement data record 2.1 st_line = {} st_line_seq = st_line_seq + 1 st_line['sequence'] = st_line_seq st_line['type'] = 'general' - st_line['reconcile'] = False + st_line['reconcile'] = False + st_line['trans_family'] = False st_line['struct_comm_type'] = '' + st_line['struct_comm_type_id'] = 0 st_line['struct_comm_type_desc'] = '' - st_line['struct_comm_101'] = '' + st_line['struct_comm_bba'] = '' st_line['communication'] = '' + st_line['payment_reference'] = '' st_line['partner_id'] = 0 st_line['account_id'] = 0 st_line['counterparty_name'] = '' - st_line['counterparty_bic'] = '' + st_line['counterparty_bic'] = '' st_line['counterparty_number'] = '' - st_line['counterparty_currency'] = '' + st_line['counterparty_currency'] = '' st_line['glob_lvl_flag'] = False st_line['globalisation_id'] = 0 st_line['globalisation_code'] = '' st_line['globalisation_amount'] = False st_line['amount'] = False - + st_line['ref'] = line[2:10] + st_line['ref_move'] = line[2:6] + st_line['ref_move_detail'] = line[6:10] + + if st_line_seq == 1: + main_move_stack = [st_line] # initialise main_move_stack (used to link 2.1 detail records to 2.1 main record + glob_lvl_stack = [0] # initialise globalisation stack + elif st_line['ref_move_detail'] == '0000': + glob_lvl_stack = [0] # re-initialise globalisation stack + st_line['trans_ref'] = line[10:31] st_line_amt = list2float(line[32:47]) if line[31] == '1': # 1=debit st_line_amt = - st_line_amt - # processing of amount depending on globalisation code + + st_line['trans_type'] = line[53] + trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table) + if not trans_type: + err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type'] + err_code = 'R2001' + if batch: + return (err_code, err_string) + raise osv.except_osv(_('Data Error!'), err_string) + st_line['trans_type_id'] = trans_type[0]['id'] + st_line['trans_type_desc'] = trans_type[0]['description'] + + # processing of amount depending on globalisation code glob_lvl_flag = int(line[124]) - if glob_lvl_flag > 0: - if glob_lvl_stack[-1] == glob_lvl_flag: - st_line['glob_lvl_flag'] = glob_lvl_flag + if glob_lvl_flag > 0: + if glob_lvl_stack[-1] == glob_lvl_flag: + st_line['glob_lvl_flag'] = glob_lvl_flag st_line['amount'] = st_line_amt glob_lvl_stack.pop() else: @@ -257,199 +290,388 @@ class account_coda_import(osv.osv_memory): st_line['type'] = 'globalisation' st_line['glob_lvl_flag'] = glob_lvl_flag st_line['globalisation_amount'] = st_line_amt - st_line['account_id'] = None else: st_line['amount'] = st_line_amt - # positions 48-53 : Value date or 000000 if not known (DDMMYY) + + # The 'globalisation' concept can also be implemented without the globalisation level flag. + # This is e.g. used by Europabank to give the details of Card Payments. + if st_line['ref_move'] == main_move_stack[-1]['ref_move']: + if st_line['ref_move_detail'] == '9999': + # Current CODA parsing logic doesn't support > 9999 detail lines + err_string = _('\nTransaction Detail Limit reached!') + err_code = 'R2010' + if batch: + return (err_code, err_string) + raise osv.except_osv(_('Data Error!'), err_string) + elif st_line['ref_move_detail'] != '0000': + if glob_lvl_stack[-1] == 0: + # promote associated move record into a globalisation + glob_lvl_flag = 1 + glob_lvl_stack.append(glob_lvl_flag) + main_st_line_seq = main_move_stack[-1]['sequence'] + to_promote = coda_statement['coda_statement_lines'][main_st_line_seq] + if not main_move_stack[-1].get('detail_cnt'): + to_promote.update({ + 'type': 'globalisation', + 'glob_lvl_flag': glob_lvl_flag, + 'globalisation_amount': main_move_stack[-1]['amount'], + 'amount': False, + 'account_id': 0, + }) + main_move_stack[-1]['promoted'] = True + if not main_move_stack[-1].get('detail_cnt'): + main_move_stack[-1]['detail_cnt'] = 1 + else: + main_move_stack[-1]['detail_cnt'] += 1 + + # positions 48-53 : Valuta date or 000000 if not known (DDMMYY) st_line['val_date'] = str2date(line[47:53]) # positions 54-61 : transaction code - st_line['trans_type'] = line[53] - trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table) - if not trans_type: - err_string = _('\nThe File contains an invalid CODA Transaction Type : %s.') % st_line['trans_type'] - err_code = 'R2001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - st_line['trans_type_desc'] = trans_type[0]['description'] st_line['trans_family'] = line[54:56] trans_family = filter(lambda x: (x['type'] == 'family') and (st_line['trans_family'] == x['code']), trans_code_table) if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s.') % st_line['trans_family'] + err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] err_code = 'R2002' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) + st_line['trans_family_id'] = trans_family[0]['id'] st_line['trans_family_desc'] = trans_family[0]['description'] st_line['trans_code'] = line[56:58] - trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), + trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), trans_code_table) if trans_code: + st_line['trans_code_id'] = trans_code[0]['id'] st_line['trans_code_desc'] = trans_code[0]['description'] else: + st_line['trans_code_id'] = None st_line['trans_code_desc'] = _('Transaction Code unknown, please consult your bank.') st_line['trans_category'] = line[58:61] trans_category = filter(lambda x: st_line['trans_category'] == x['category'], trans_category_table) if trans_category: + st_line['trans_category_id'] = trans_category[0]['id'] st_line['trans_category_desc'] = trans_category[0]['description'] else: - st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 61-115 : communication + st_line['trans_category_id'] = None + st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') + # positions 61-115 : communication if line[61] == '1': st_line['struct_comm_type'] = line[62:65] comm_type = filter(lambda x: st_line['struct_comm_type'] == x['code'], comm_type_table) if not comm_type: - err_string = _('\nThe File contains an invalid Structured Communication Type : %s.') % st_line['struct_comm_type'] + err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % st_line['struct_comm_type'] err_code = 'R2003' if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) + st_line['struct_comm_type_id'] = comm_type[0]['id'] st_line['struct_comm_type_desc'] = comm_type[0]['description'] st_line['communication'] = st_line['name'] = line[65:115] - if st_line['struct_comm_type'] == '101': - bbacomm = line[65:77] - st_line['struct_comm_101'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++' + if st_line['struct_comm_type'] in ['101', '102']: + bbacomm = line[65:77] + st_line['struct_comm_bba'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++' else: st_line['communication'] = st_line['name'] = line[62:115] st_line['entry_date'] = str2date(line[115:121]) - # positions 122-124 not processed - coda_statement_lines[st_line_seq] = st_line + if st_line['sequence'] == 1: + coda_statement['first_transaction_date'] = st_line['entry_date'] + # positions 122-124 not processed + coda_statement_lines[st_line_seq] = st_line # store transaction + + if st_line['ref_move'] != main_move_stack[-1]['ref_move']: + if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): + # add closing globalisation level on previous detail record in order to correctly close + # moves that have been 'promoted' to globalisation + closeglobalise = coda_statement['coda_statement_lines'][st_line_seq-1] + closeglobalise.update({ + 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], + }) + else: + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + # the same logic is repeated on the New Balance Record ('8 Record') in order to cope with CODA files + # containing a single 2.1 record that needs to be 'demoted'. + if main_move_stack[-1]['type'] == 'globalisation' and not main_move_stack[-1].get('detail_cnt'): + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + main_st_line_seq = main_move_stack[-1]['sequence'] + to_demote = coda_statement['coda_statement_lines'][main_st_line_seq] + to_demote.update({ + 'type': 'general', + 'glob_lvl_flag': 0, + 'globalisation_amount': False, + 'amount': main_move_stack[-1]['globalisation_amount'], + }) + main_move_stack.pop() + main_move_stack.append(st_line) coda_statement['coda_statement_lines'] = coda_statement_lines + elif line[1] == '2': # movement data record 2.2 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on movement data record 2.2, seq nr %s.' \ + if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: + err_string = _('\nCODA parsing error on movement data record 2.2, seq nr %s!' \ '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R2004' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:63] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:63] + coda_statement['coda_statement_lines'][st_line_seq]['payment_reference'] = line[63:98].strip() coda_statement['coda_statement_lines'][st_line_seq]['counterparty_bic'] = line[98:109].strip() + elif line[1] == '3': # movement data record 2.3 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s.' \ + if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: + err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \ '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R2005' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) st_line = coda_statement_lines[st_line_seq] if coda_version == '1': - counterparty_number = line[10:22] + counterparty_number = line[10:22].strip() counterparty_name = line[47:125].strip() counterparty_currency = '' else: if line[22] == ' ': - counterparty_number = line[10:22] + counterparty_number = line[10:22].strip() counterparty_currency = line[23:26].strip() else: counterparty_number = line[10:44].strip() - counterparty_currency = line[44:47].strip() + counterparty_currency = line[44:47].strip() counterparty_name = line[47:82].strip() st_line['name'] += line[82:125] st_line['communication'] += line[82:125] st_line['counterparty_number'] = counterparty_number st_line['counterparty_currency'] = counterparty_currency st_line['counterparty_name'] = counterparty_name + """ + TO DO: + + replace code infra by check on flag 128 and copy info in Notes Field. + if counterparty_currency not in [coda_bank['currency_name'], '']: - err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s.' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] + err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \ + '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R2006' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) + """ - # partner matching and reconciliation - if st_line['type'] == 'general': + # invoice matching and reconciliation + if st_line['type'] == 'general': match = False - bank_ids = False - # prepare reconciliation for bba scor - reference = st_line['struct_comm_101'] - if reference and find_bbacom: - inv_ids = inv_obj.search(cr , uid, [('reference' ,'=', reference), ('reference_type' ,'=', 'bba')]) - if inv_ids: - invoice = inv_obj.browse(cr, uid, inv_ids[0]) - partner = invoice.partner_id - st_line['partner_id'] = partner.id - if invoice.type in ['in_invoice', 'in_refund']: - st_line['account_id'] = partner.property_account_payable.id or def_pay_acc - st_line['type'] = 'supplier' + payment_reference_match = False + inv_ids = None + partner_bank_ids = False + + # check payment reference in bank statement line against payment order lines + payment_reference = st_line['payment_reference'] + if payment_reference and find_payment and st_line['amount'] < 0: + payline_ids = payment_line_obj and payment_line_obj.search(cr, uid, [('name', '=', payment_reference)]) + if payline_ids: + if len(payline_ids) == 1: + payline = payment_line_obj.browse(cr, uid, payline_ids[0]) + match = True + payment_reference_match = True + st_line['partner_id'] = payline.partner_id.id + if payline.move_line_id: + st_line['reconcile'] = payline.move_line_id.id + st_line['account_id'] = payline.move_line_id.account_id.id + if payline._get_ml_inv_ref: + inv_type = payline.ml_inv_ref.type + st_line['type'] = inv_type == 'in_invoice' and 'supplier' or 'customer' + else: + st_line['type'] = 'general' else: - st_line['account_id'] = partner.property_account_receivable.id or def_rec_acc - st_line['type'] = 'customer' - if invoice.type in ['in_invoice', 'out_invoice']: - iml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)]) - if iml_ids: - st_line['reconcile'] = iml_ids[0] - match = True + err_string = _('\nThe CODA parsing detected a payment reference ambiguity while processing movement data record 2.3, seq nr %s!' \ + '\nPlease check your Payment Gateway configuration or contact your OpenERP support channel.') % line[2:10] + err_code = 'R2007' + if batch: + return (err_code, err_string) + raise osv.except_osv(_('Error!'), err_string) + + # check bba scor in bank statement line against open invoices + if st_line['struct_comm_bba'] and find_bbacom: + if st_line['amount'] > 0: + domain = [('type', 'in', ['out_invoice', 'in_refund'])] else: - coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \ - "\n There is no invoice matching the Structured Communication '%s'." \ + domain = [('type', 'in', ['in_invoice', 'out_refund'])] + inv_ids = inv_obj.search(cr , uid, + domain + [('state', '=', 'open'), ('reference' ,'=', st_line['struct_comm_bba']), ('reference_type' ,'=', 'bba')]) + if not inv_ids: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n There is no invoice matching the Structured Communication '%s'!" \ "\n Please verify and adjust the invoice and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (coda_statement['name'], st_line['ref'], reference) - # lookup partner via counterparty_number + % (st_line['ref'], st_line['struct_comm_bba']) + elif len(inv_ids) == 1: + match = True + elif len(inv_ids) > 1: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n There are multiple invoices matching the Structured Communication '%s'!" \ + "\n A manual reconciliation is required.") \ + % (st_line['ref'], st_line['struct_comm_bba']) + + # use free comm in bank statement line for lookup against open invoices + if not match and find_bbacom: + # extract possible bba scor from free form communication and try to find matching invoice + free_comm_digits = re.sub('\D', '', st_line['communication'] or '') + select = "SELECT id FROM (SELECT id, type, state, amount_total, number, reference_type, reference, " \ + "'%s'::text AS free_comm_digits FROM account_invoice) sq " \ + "WHERE state = 'open' AND reference_type = 'bba' " \ + "AND free_comm_digits LIKE '%%'||regexp_replace(reference, '\\\D', '', 'g')||'%%'" \ + % (free_comm_digits) + if st_line['amount'] > 0: + select2 = " AND type IN ('out_invoice', 'in_refund')" + else: + select2 = " AND type IN ('in_invoice', 'out_refund')" + cr.execute(select + select2) + res=cr.fetchall() + if res: + inv_ids = [x[0] for x in res] + if len(inv_ids) == 1: + match = True + if not match and st_line['communication'] and find_inv_number: + # check matching invoice number in free form communication combined with matching amount + free_comm = repl_special(st_line['communication'].strip()) + amount_fmt = '%.' + str(digits) + 'f' + if st_line['amount'] > 0: + amount_rounded = amount_fmt % round(st_line['amount'], digits) + else: + amount_rounded = amount_fmt % round(-st_line['amount'], digits) + select = "SELECT id FROM (SELECT id, type, state, amount_total, number, reference_type, reference, " \ + "'%s'::text AS free_comm FROM account_invoice) sq " \ + "WHERE state = 'open' AND amount_total = %s" \ + % (free_comm, amount_rounded) + # 'out_invoice', 'in_refund' + if st_line['amount'] > 0: + select2 = " AND type = 'out_invoice' AND free_comm ilike '%'||number||'%'" + cr.execute(select + select2) + res=cr.fetchall() + if res: + inv_ids = [x[0] for x in res] + else: + select2 = " AND type = 'in_refund' AND free_comm ilike '%'||reference||'%'" + cr.execute(select + select2) + res=cr.fetchall() + if res: + inv_ids = [x[0] for x in res] + # 'in_invoice', 'out_refund' + else: + select2 = " AND type = 'in_invoice' AND free_comm ilike '%'||reference||'%'" + cr.execute(select + select2) + res=cr.fetchall() + if res: + inv_ids = [x[0] for x in res] + else: + select2 = " AND type = 'out_refund' AND free_comm ilike '%'||number||'%'" + cr.execute(select + select2) + res=cr.fetchall() + if res: + inv_ids = [x[0] for x in res] + if inv_ids: + if len(inv_ids) == 1: + match = True + elif len(inv_ids) > 1: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n There are multiple invoices matching the Invoice Amount and Reference." \ + "\n A manual reconciliation is required.") \ + % (st_line['ref']) + + if not payment_reference_match and match and inv_ids and len(inv_ids) == 1: + invoice = inv_obj.browse(cr, uid, inv_ids[0]) + partner = invoice.partner_id + st_line['partner_id'] = partner.id + if invoice.type in ['in_invoice', 'in_refund']: + st_line['account_id'] = partner.property_account_payable.id + st_line['type'] = 'supplier' + else: + st_line['account_id'] = partner.property_account_receivable.id + st_line['type'] = 'customer' + iml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)]) + if iml_ids: + st_line['reconcile'] = iml_ids[0] + else: + err_string = _('\nThe CODA parsing detected a database inconsistency while processing movement data record 2.3, seq nr %s!' \ + '\nPlease report this issue via your OpenERP support channel.') % line[2:10] + err_code = 'R2008' + if batch: + return (err_code, err_string) + raise osv.except_osv(_('Error!'), err_string) + + # lookup partner via counterparty_number when invoice lookup failed if not match and counterparty_number: - cba_filter = lambda x: ((counterparty_number in (x['iban'] or '')) or (counterparty_number == x['acc_number'])) \ - and (x['state'] == 'normal') - transfer_account = filter(cba_filter, coda_bank_table) + transfer_account = filter(lambda x: counterparty_number in x, company_bank_accounts) if transfer_account: st_line['account_id'] = transfer_acc match = True elif find_partner: - counterparty_number = base_iban._pretty_iban(base_iban._format_iban(counterparty_number)) - bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number)]) - if not match and find_partner and bank_ids: - if len(bank_ids) > 1: - coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \ - "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'." \ + partner_bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number)]) + if not match and find_partner and partner_bank_ids: + if len(partner_bank_ids) > 1: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'!" \ "\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (coda_statement['name'], st_line['ref'], counterparty_number) - else: - bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context) - st_line['partner_id'] = bank.partner_id.id + % (st_line['ref'], counterparty_number) + else: + partner_bank = partner_bank_obj.browse(cr, uid, partner_bank_ids[0], context) + st_line['partner_id'] = partner_bank.partner_id.id match = True if st_line['amount'] < 0: - st_line['account_id'] = bank.partner_id.property_account_payable.id or def_pay_acc + st_line['account_id'] = partner_bank.partner_id.property_account_payable.id st_line['type'] = 'supplier' else: - st_line['account_id'] = bank.partner_id.property_account_receivable.id or def_rec_acc + st_line['account_id'] = partner_bank.partner_id.property_account_receivable.id st_line['type'] = 'customer' elif not match and find_partner: if counterparty_number: - coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \ - "\n The bank account '%s' is not defined for the partner '%s'." \ + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n The bank account '%s' is not defined for the partner '%s'!" \ "\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (coda_statement['name'], st_line['ref'], - counterparty_number, counterparty_name) + % (st_line['ref'], counterparty_number, counterparty_name) else: - coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \ - "\n No matching partner record found." \ + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ + "\n No matching partner record found!" \ "\n Please adjust the corresponding entry manually in the generated Bank Statement.") \ - % (coda_statement['name'], st_line['ref']) + % (st_line['ref']) st_line['account_id'] = awaiting_acc - # end of partner record lookup + + # add bank account to partner record + if match and st_line['account_id'] != transfer_acc and counterparty_number and update_partner: + partner_bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number), ('partner_id', '=', st_line['partner_id'])], order='id') + if len(partner_bank_ids) > 1: + # clean up partner bank duplicates, keep most recently created + _logger.warn('Duplicate Bank Accounts for partner_id %s have been removed, ids = %s', + st_line['partner_id'], partner_bank_ids[:-1]) + partner_bank_obj.unlink(cr,uid, partner_bank_ids[:-1]) + if not partner_bank_ids: + feedback = update_partner_bank(self, cr, uid, st_line['counterparty_bic'], counterparty_number, st_line['partner_id'], counterparty_name) + if feedback: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':") % st_line['ref'] + feedback + coda_statement_lines[st_line_seq] = st_line coda_statement['coda_statement_lines'] = coda_statement_lines + # end of processing movement data record 2.3 + else: # movement data record 2.x (x <> 1,2,3) - err_string = _('\nMovement data records of type 2.%s are not supported.') % line[1] - err_code = 'R2007' + err_string = _('\nMovement data records of type 2.%s are not supported !') % line[1] + err_code = 'R2009' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) elif line[0] == '3': # information data record 3 + if line[1] == '1': # information data record 3.1 info_line = {} info_line['entry_date'] = st_line['entry_date'] info_line['type'] = 'information' st_line_seq = st_line_seq + 1 - info_line['sequence'] = st_line_seq + info_line['sequence'] = st_line_seq info_line['struct_comm_type'] = '' info_line['struct_comm_type_desc'] = '' info_line['communication'] = '' @@ -463,19 +685,19 @@ class account_coda_import(osv.osv_memory): err_code = 'R3001' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - info_line['trans_type_desc'] = trans_type[0]['description'] + raise osv.except_osv(_('Data Error!'), err_string) + info_line['trans_type_desc'] = trans_type[0]['description'] info_line['trans_family'] = line[32:34] trans_family = filter(lambda x: (x['type'] == 'family') and (info_line['trans_family'] == x['code']), trans_code_table) if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s.') % st_line['trans_family'] + err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] err_code = 'R3002' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) info_line['trans_family_desc'] = trans_family[0]['description'] info_line['trans_code'] = line[34:36] - trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id']), + trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), trans_code_table) if trans_code: info_line['trans_code_desc'] = trans_code[0]['description'] @@ -486,13 +708,13 @@ class account_coda_import(osv.osv_memory): if trans_category: info_line['trans_category_desc'] = trans_category[0]['description'] else: - info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 40-113 : communication + info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') + # positions 40-113 : communication if line[39] == '1': info_line['struct_comm_type'] = line[40:43] comm_type = filter(lambda x: info_line['struct_comm_type'] == x['code'], comm_type_table) if not comm_type: - err_string = _('\nThe File contains an invalid Structured Communication Type : %s.') % info_line['struct_comm_type'] + err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % info_line['struct_comm_type'] err_code = 'R3003' if batch: return (err_code, err_string) @@ -504,21 +726,23 @@ class account_coda_import(osv.osv_memory): # positions 114-128 not processed coda_statement_lines[st_line_seq] = info_line coda_statement['coda_statement_lines'] = coda_statement_lines + elif line[1] == '2': # information data record 3.2 if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on information data record 3.2, seq nr %s.' \ + err_string = _('\nCODA parsing error on information data record 3.2, seq nr %s!' \ '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R3004' if batch: return (err_code, err_string) raise osv.except_osv(_('Error!'), err_string) - coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115] + coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:115] + elif line[1] == '3': # information data record 3.3 if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on information data record 3.3, seq nr %s.' \ + err_string = _('\nCODA parsing error on information data record 3.3, seq nr %s!' \ '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R3005' if batch: @@ -526,7 +750,7 @@ class account_coda_import(osv.osv_memory): raise osv.except_osv(_('Error!'), err_string) coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:100] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:100] - + elif line[0] == '4': # free communication data record 4 comm_line = {} @@ -537,21 +761,64 @@ class account_coda_import(osv.osv_memory): comm_line['communication'] = comm_line['name'] = line[32:112] coda_statement_lines[st_line_seq] = comm_line coda_statement['coda_statement_lines'] = coda_statement_lines - + elif line[0] == '8': # new balance record + last_transaction = main_move_stack[-1] + if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + main_st_line_seq = main_move_stack[-1]['sequence'] + to_demote = coda_statement['coda_statement_lines'][main_st_line_seq] + to_demote.update({ + 'type': 'general', + 'glob_lvl_flag': 0, + 'globalisation_amount': False, + 'amount': main_move_stack[-1]['globalisation_amount'], + }) + # add closing globalisation level on previous detail record in order to correctly close + # moves that have been 'promoted' to globalisation + if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): + closeglobalise = coda_statement['coda_statement_lines'][st_line_seq-1] + closeglobalise.update({ + 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], + }) + coda_statement['paper_nb_seq_number'] = line[1:4] bal_end = list2float(line[42:57]) + coda_statement['new_balance_date'] = str2date(line[57:63]) if line[41] == '1': # 1=Debit bal_end = - bal_end coda_statement['balance_end_real'] = bal_end - + if coda_statement['new_balance_date']: + period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['new_balance_date']), ('date_stop','>=',coda_statement['new_balance_date'])]) + else: + period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['date']), ('date_stop','>=',coda_statement['date'])]) + if not period_id: + err_string = _("\nThe CODA Statement New Balance date doesn't fall within a defined Accounting Period!" \ + "\nPlease create the Accounting Period for date %s.") % coda_statement['new_balance_date'] + err_code = 'R0002' + if batch: + return (err_code, err_string) + raise osv.except_osv(_('Data Error!'), err_string) + coda_statement['period_id'] = period_id[0] + if coda_bank['coda_st_naming']: + coda_statement['name'] = coda_bank['coda_st_naming'] % { + 'code': coda_bank['journal_code'] or '', + 'year': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][:4] or coda_statement['date'][:4], + 'y': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][2:4] or coda_statement['date'][2:4], + 'coda': coda_statement['coda_seq_number'], + 'paper_ob': coda_statement['paper_ob_seq_number'], + 'paper': coda_statement['paper_nb_seq_number'], + } + else: + coda_statement['name'] = '/' + elif line[0] == '9': # footer record - coda_statement['balance_min'] = list2float(line[22:37]) + coda_statement['balance_min'] = list2float(line[22:37]) coda_statement['balance_plus'] = list2float(line[37:52]) if not bal_end: coda_statement['balance_end_real'] = coda_statement['balance_start'] + coda_statement['balance_plus'] - coda_statement['balance_min'] - if coda_parsing_note: + if coda_parsing_note: coda_statement['coda_parsing_note'] = '\nStatement Line matching results:' + coda_parsing_note else: coda_statement['coda_parsing_note'] = '' @@ -559,11 +826,11 @@ class account_coda_import(osv.osv_memory): #end for err_string = '' - err_code = '' + err_code = '' coda_id = 0 coda_note = '' line_note = '' - + try: coda_id = coda_obj.create(cr, uid,{ 'name' : codafilename, @@ -573,7 +840,7 @@ class account_coda_import(osv.osv_memory): 'user_id': uid, }) context.update({'coda_id': coda_id}) - + except osv.except_osv, e: cr.rollback() err_string = _('\nApplication Error : ') + str(e) @@ -587,78 +854,127 @@ class account_coda_import(osv.osv_memory): err_code = 'G0001' if batch: return (err_code, err_string) - raise osv.except_osv(_('CODA Import failed.'), err_string) + raise osv.except_osv(_('CODA Import failed !'), err_string) nb_err = 0 err_string = '' coda_st_ids = [] - bk_st_ids = [] - + bk_st_ids = [] + for statement in coda_statements: - + # The CODA Statement info is written to two objects: 'coda.bank.statement' and 'account.bank.statement' try: - + normal2info = False + lines = statement['coda_statement_lines'] + if not statement['first_transaction_date']: + normal2info = True # don't create a bank statement for CODA's without transactions + else: + line_vals = [x for x in lines.itervalues()] + transactions = filter(lambda x: (x['type'] in ['globalisation', 'general', 'supplier', 'customer']) and x['amount'], line_vals) + if not transactions: + normal2info = True # don't create a bank statement for CODA's without transactions + if normal2info: + statement['type'] = 'info' # don't create a bank statement for CODA's without transactions + statement['coda_parsing_note'] += _("\n\nThe CODA Statement %s does not contain transactions, hence no Bank Statement has been created." \ + "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ + %(statement['name'], statement['name']) + coda_st_id = coda_st_obj.create(cr, uid, { 'name': statement['name'], 'type': statement['type'], 'coda_bank_account_id': statement['coda_bank_account_id'], - 'currency': statement['currency_id'], + 'currency': statement['currency_id'], 'journal_id': statement['journal_id'], 'coda_id': coda_id, 'date': statement['date'], + 'coda_creation_date': statement['coda_creation_date'], 'period_id': statement['period_id'], + 'old_balance_date': statement['old_balance_date'], + 'new_balance_date': statement['new_balance_date'], 'balance_start': statement['balance_start'], 'balance_end_real': statement['balance_end_real'], - 'state':'draft', }) coda_st_ids.append(coda_st_id) - if statement['type'] == 'normal': + # check duplicates for CODA's of type 'normal' + discard = False + if statement['type'] == 'normal' and statement['discard_dup']: + dup_ids = bank_st_obj.search(cr, uid, [('name', '=', statement['name']), ('company_id', '=', company_id)]) + if dup_ids: + discard = True + statement['type'] = 'info' # don't create a bank statement for duplicates + statement['coda_parsing_note'] += _("\n\nThe Bank Statement %s already exists, hence no duplicate Bank Statement has been created." \ + "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ + %(statement['name'], statement['name']) + + # create only bank statement for CODA's of type 'normal' + if statement['type'] == 'normal' and not discard: context.update({'ebanking_import': 1}) journal = journal_obj.browse(cr, uid, statement['journal_id'], context=context) + balance_start_check_date = statement['first_transaction_date'] or statement['date'] cr.execute('SELECT balance_end_real \ FROM account_bank_statement \ WHERE journal_id = %s and date < %s \ - ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'], statement['date'])) + ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'], balance_start_check_date)) res = cr.fetchone() balance_start_check = res and res[0] if balance_start_check == None: if journal.default_debit_account_id and (journal.default_credit_account_id == journal.default_debit_account_id): balance_start_check = journal.default_debit_account_id.balance else: - nb_err += 1 - err_string += _('\nConfiguration Error!\nPlease verify the Default Debit and Credit Account settings in journal %s.') % journal.name + nb_err += 1 + err_string += _('\nConfiguration Error in journal %s!' \ + '\nPlease verify the Default Debit and Credit Account settings.') % journal.name break - if balance_start_check <> statement['balance_start']: - nb_err += 1 - err_string += _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s.') \ - % (statement['name'], statement['balance_start'], balance_start_check, journal.name) + if balance_start_check <> statement['balance_start']: + balance_start_err_string = _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!') \ + % (statement['name'], statement['balance_start'], balance_start_check, journal.name) + if statement['balance_start_enforce']: + nb_err += 1 + err_string += balance_start_err_string break + else: + statement['coda_parsing_note'] += '\n' + balance_start_err_string - bk_st_id = bank_st_obj.create(cr, uid, { + st_vals = { 'name': statement['name'], 'journal_id': statement['journal_id'], 'coda_statement_id': coda_st_id, - 'date': statement['date'], + 'date': statement['new_balance_date'], 'period_id': statement['period_id'], 'balance_start': statement['balance_start'], 'balance_end_real': statement['balance_end_real'], 'state': 'draft', - }) + } + st_hook_error, st_vals = self._statement_hook(cr, uid, statement['coda_bank_params'], st_vals, context=context) + if st_hook_error: + nb_err += 1 + err_string += st_hook_error + break + bk_st_id = bank_st_obj.create(cr, uid, st_vals, context=context) bk_st_ids.append(bk_st_id) coda_st_obj.write(cr, uid, [coda_st_id], {'statement_id': bk_st_id}, context=context) - - glob_id_stack = [(0, '', 0, '')] # stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) - lines = statement['coda_statement_lines'] + st_line_seq = 0 for x in lines: line = lines[x] + + if not line['type'] == 'communication': + if line['trans_family'] in st_line_name_families: + line['name'] = get_st_line_name(line, context) + if line['type'] == 'information': + if line['struct_comm_type'] in parse_comms_info: + line['name'], line['communication'] = parse_comm_info(self, cr, uid, line, comm_type_table, context) + elif line['struct_comm_type'] in parse_comms_move: + line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) + elif line['struct_comm_type'] in parse_comms_move: + line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) # handling non-transactional records : line['type'] in ['information', 'communication'] - + if line['type'] == 'information': line['globalisation_id'] = glob_id_stack[-1][2] @@ -674,25 +990,25 @@ class account_coda_import(osv.osv_memory): line['trans_category'], line['trans_category_desc'], line['struct_comm_type'], line['struct_comm_type_desc'], line['communication']) - + coda_st_line_id = coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', - 'type' : 'information', - 'date': line['entry_date'], + 'type' : 'information', + 'date': line['entry_date'], 'statement_id': coda_st_id, 'note': line_note, }) - + elif line['type'] == 'communication': line_note = _('Free Communication:\n %s') \ %(line['communication']) - + coda_st_line_id = coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', 'type' : 'communication', 'date': statement['date'], @@ -700,34 +1016,39 @@ class account_coda_import(osv.osv_memory): 'note': line_note, }) - # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer'] + # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer'] else: - + + if line['ref_move_detail'] == '0000': + glob_id_stack = [(0, '', 0, '')] # initialise stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) + glob_lvl_flag = line['glob_lvl_flag'] - if glob_lvl_flag: - if glob_id_stack[-1][0] == glob_lvl_flag: + if glob_lvl_flag: + if glob_id_stack[-1][0] == glob_lvl_flag: line['globalisation_id'] = glob_id_stack[-1][2] glob_id_stack.pop() else: glob_name = line['name'].strip() or '/' glob_code = seq_obj.get(cr, uid, 'statement.line.global') glob_id = glob_obj.create(cr, uid, { - 'code': glob_code, + 'code': glob_code, 'name': glob_name, 'type': 'coda', 'parent_id': glob_id_stack[-1][2], 'amount': line['globalisation_amount'], + 'payment_reference': line['payment_reference'] }) line['globalisation_id'] = glob_id glob_id_stack.append((glob_lvl_flag, glob_code, glob_id, glob_name)) - - line_note = _('Partner name: %s \nPartner Account Number: %s' \ + + line_note = _('Partner Name: %s \nPartner Account Number: %s' \ '\nTransaction Type: %s - %s' \ '\nTransaction Family: %s - %s' \ '\nTransaction Code: %s - %s' \ '\nTransaction Category: %s - %s' \ '\nStructured Communication Type: %s - %s' \ + '\nPayment Reference: %s' \ '\nCommunication: %s') \ %(line['counterparty_name'], line['counterparty_number'], line['trans_type'], line['trans_type_desc'], @@ -735,135 +1056,208 @@ class account_coda_import(osv.osv_memory): line['trans_code'], line['trans_code_desc'], line['trans_category'], line['trans_category_desc'], line['struct_comm_type'], line['struct_comm_type_desc'], + line['payment_reference'], line['communication']) - + if line['type'] == 'globalisation': - + coda_st_line_id = coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', 'type' : 'globalisation', - 'val_date' : line['val_date'], + 'val_date' : line['val_date'], 'date': line['entry_date'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_amount': line['globalisation_amount'], - 'globalisation_id': line['globalisation_id'], + 'globalisation_level': line['glob_lvl_flag'], + 'globalisation_amount': line['globalisation_amount'], + 'globalisation_id': line['globalisation_id'], 'partner_id': line['partner_id'] or 0, 'account_id': line['account_id'], + 'payment_reference': line['payment_reference'], 'statement_id': coda_st_id, 'note': line_note, }) - else: # line['type'] in ['general', 'supplier', 'customer'] + else: # line['type'] in ['general', 'supplier', 'customer'] - if glob_lvl_flag == 0: + if glob_lvl_flag == 0: line['globalisation_id'] = glob_id_stack[-1][2] - if not line['account_id']: + if not line['account_id']: line['account_id'] = awaiting_acc - + coda_st_line_id = coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'] or '/', + 'ref': line['ref'], + 'name': line['name'].strip() or '/', 'type' : line['type'], - 'val_date' : line['val_date'], + 'val_date' : line['val_date'], 'date': line['entry_date'], 'amount': line['amount'], 'partner_id': line['partner_id'] or 0, 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], + 'counterparty_bic': line['counterparty_bic'], + 'counterparty_number': line['counterparty_number'], + 'counterparty_currency': line['counterparty_currency'], 'account_id': line['account_id'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_id': line['globalisation_id'], + 'globalisation_level': line['glob_lvl_flag'], + 'globalisation_id': line['globalisation_id'], + 'payment_reference': line['payment_reference'], 'statement_id': coda_st_id, 'note': line_note, }) if statement['type'] == 'normal': - - st_line_seq += 1 - voucher_id = False - line_name = line['name'].strip() - if not line_name: - if line['globalisation_id']: - line_name = glob_id_stack[-1][3] - else: - line_name = '/' - - if line['reconcile']: - voucher_vals = { - 'type': line['type'] == 'supplier' and 'payment' or 'receipt', - 'name': line_name, - 'partner_id': line['partner_id'], - 'journal_id': statement['journal_id'], - 'account_id': journal.default_credit_account_id.id, - 'company_id': journal.company_id.id, - 'currency_id': journal.company_id.currency_id.id, - 'date': line['entry_date'], - 'amount': abs(line['amount']), - 'period_id': statement['period_id'], - } - voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context) - - move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) - voucher_dict = voucher_obj.onchange_partner_id(cr, uid, [], - partner_id = line['partner_id'], - journal_id = statement['journal_id'], - price = abs(line['amount']), - currency_id = journal.company_id.currency_id.id, - ttype = line['type'] == 'supplier' and 'payment' or 'receipt', - date = line['val_date'], - context = context) - #_logger.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']: - if line_dict['move_line_id'] == move_line.id: - voucher_line_vals = line_dict - if voucher_line_vals: - voucher_line_vals.update({ - 'voucher_id': voucher_id, + if line['amount'] != 0.0: + st_line_seq += 1 + voucher_id = False + line_name = line['name'].strip() + if not line_name: + if line['globalisation_id']: + line_name = glob_id_stack[-1][3] or '/' + else: + line_name = '/' + + if line['reconcile']: + + move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) + company_currency_id = journal.company_id.currency_id.id + currency_id = journal.currency.id + if currency_id and currency_id != company_currency_id: + multi_currency = True + else: + multi_currency = False + context_multi_currency = context.copy() + context_multi_currency.update({'date': line['entry_date']}) + + line_cr_ids = [] + line_dr_ids = [] + amount_remaining = abs(line['amount']) + + #for entry in entries: + if move_line.reconcile_partial_id: + amount_original = abs(move_line.amount_residual_currency) + else: + amount_original = move_line.credit or move_line.debit + if multi_currency: + if move_line.currency_id and move_line.amount_currency: + amount_original = abs(move_line.amount_currency) + else: + amount_original = currency_obj.compute(cr, uid, company_currency_id, currency_id, original_amount, context=context_multi_currency) + if amount_remaining > 0: + amount_voucher_line = min(amount_original, abs(amount_remaining)) + amount_remaining -= amount_voucher_line + else: + amount_voucher_line = 0.0 + voucher_line_vals = { + 'name': move_line.name, + 'account_id': move_line.account_id.id, + 'amount': amount_voucher_line, + 'reconcile': amount_voucher_line == amount_original, + 'type': move_line.credit and 'dr' or 'cr', + 'move_line_id': move_line.id, + } + if voucher_line_vals['type'] == 'cr': + line_cr_ids += [(0, 0, voucher_line_vals)] + else: + line_dr_ids += [(0, 0, voucher_line_vals)] + + voucher_vals = { + 'type': line['type'] == 'supplier' and 'payment' or 'receipt', + 'name': line_name, + 'date': line['val_date'], + 'journal_id': statement['journal_id'], + 'account_id': journal.default_credit_account_id.id, + 'line_cr_ids': line_cr_ids, + 'line_dr_ids': line_dr_ids, + 'pre_line': len(line_dr_ids) > 0 and True or False, + 'period_id': statement['period_id'], + 'currency_id': journal.currency and journal.currency.id or journal.company_id.currency_id.id, + 'company_id': journal.company_id.id, + 'state': 'draft', 'amount': abs(line['amount']), - }) - voucher_line_obj.create(cr, uid, voucher_line_vals, context=context) + 'reference': line['ref'], + 'number': statement['name'] + '/' + str(st_line_seq), + 'partner_id': line['partner_id'], + } + + #_logger.warn('voucher_vals=%s, context=%s', voucher_vals, context) + context['journal_id'] = journal.id # add journal to context for __get_payment_rate_currency method + if line_cr_ids or line_dr_ids: + voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context) + else: + raise osv.except_osv(_('Error!'), _("Reconcile error while processing line with ref '%s' ! " \ + "\nPlease report this issue via your OpenERP support channel.") % line['ref']) + + # override default account mapping by mappings defined in rules engine + if statement['account_mapping_ids']: + kwargs = { + 'coda_bank_account_id': statement['coda_bank_account_id'], + 'trans_type_id': line['trans_type_id'], + 'trans_family_id': line['trans_family_id'], + 'trans_code_id': line['trans_code_id'], + 'trans_category_id': line['trans_category_id'], + 'struct_comm_type_id': line['struct_comm_type_id'], + 'partner_id': line['partner_id'], + 'context': context, + } + account_id = account_mapping_obj.account_id_get(cr, uid, **kwargs) + if account_id: + line['account_id'] = account_id + + st_line_vals = { + 'ref': line['ref'], + 'name': line_name, + 'type' : line['type'], + 'val_date' : line['val_date'], + 'date': line['entry_date'], + 'amount': line['amount'], + 'partner_id': line['partner_id'] or 0, + 'counterparty_name': line['counterparty_name'], + 'counterparty_bic': line['counterparty_bic'], + 'counterparty_number': line['counterparty_number'], + 'counterparty_currency': line['counterparty_currency'], + 'account_id': line['account_id'], + 'globalisation_id': line['globalisation_id'], + 'payment_reference': line['payment_reference'], + 'statement_id': bk_st_id, + 'voucher_id': voucher_id, + 'note': line_note, + } + + st_lines_vals = self._st_line_hook(cr, uid, statement['coda_bank_params'], st_line_vals, context=context) + if not st_lines_vals: + # removal of lines by the _coda_parsing_hook currently not supported : + # this qould require resequencing/renaming of linked vouchers & moves as well as removal of associated voucher/moves + err_string += _('\nError in _st_line_hook while processing CODA Statement %s for Bank Account %s!') \ + % (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description'])) + nb_err += 1 + for st_line_vals in st_lines_vals: + # To DO : update sequence of statement lines and naming of associated vouchers/moves when the hook returns multiple lines + st_line_vals.update({'sequence': st_line_seq}) + bank_st_line_id = bank_st_line_obj.create(cr, uid, st_line_vals, context=context) + if st_line_vals['voucher_id']: + voucher = voucher_obj.browse(cr, uid, st_line_vals['voucher_id'], context=context) + move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) + if line['amount'] == (line['amount'] > 0 and move_line.debit or -move_line.credit): + wf_service.trg_validate(uid, 'account.voucher', st_line_vals['voucher_id'], 'proforma_voucher', cr) + if voucher.move_id: + move_line_obj.write(cr, uid, [x.id for x in voucher.move_ids], {'statement_id': bk_st_id}, context=context) - bank_st_line_id = bank_st_line_obj.create(cr, uid, { - 'sequence': st_line_seq, - 'ref': line['ref'], - 'name': line_name, - 'type' : line['type'], - 'val_date' : line['val_date'], - 'date': line['entry_date'], - 'amount': line['amount'], - 'partner_id': line['partner_id'] or 0, - 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], - 'account_id': line['account_id'], - 'globalisation_id': line['globalisation_id'], - 'statement_id': bk_st_id, - 'voucher_id': voucher_id, - 'note': line_note, - }) # end 'for x in lines' coda_st_obj.write(cr, uid, [coda_st_id], {}, context=context) # calculate balance st_balance = coda_st_obj.read(cr, uid, coda_st_id, ['balance_end', 'balance_end_real'], context=context) if st_balance['balance_end'] <> st_balance['balance_end_real']: - err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s.') \ + err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s!') \ % (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description'])) if statement['type'] == 'normal': nb_err += 1 break else: statement['coda_parsing_note'] += '\n' + err_string - - if statement['type'] == 'normal': - bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance + + if statement['type'] == 'normal': + bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance journal_name = journal.name else: journal_name = _('None') @@ -879,33 +1273,38 @@ class account_coda_import(osv.osv_memory): %(journal_name, coda_version, statement['coda_seq_number'], - statement['paper_seq_number'], + statement['paper_nb_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description']), statement['acc_holder'], statement['date'], float(statement['balance_start']), float(statement['balance_end_real']), - statement['coda_parsing_note']) + statement['coda_parsing_note'] % {'name':coda_statement['name']}) + if statement.get('separate_application') != '00000': + coda_note += _('\nCode Separate Application: %s') %statement['separate_application'] \ except osv.except_osv, e: cr.rollback() nb_err += 1 err_string += _('\nError ! ') + str(e) tb = ''.join(format_exception(*exc_info())) - _logger.error('Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) + _logger.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.error('System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) + _logger.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.error('Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb)) + _logger.error('Unknown Error while processing Statement %s\n%s', + statement.get('name', '/'),tb) # end 'for statement in coda_statements' - + coda_note_header = _('CODA File is Imported :') coda_note_footer = _('\n\nNumber of statements : ') + str(len(coda_st_ids)) err_log = err_log + _('\nNumber of errors : ') + str(nb_err) + '\n' @@ -921,13 +1320,13 @@ class account_coda_import(osv.osv_memory): if batch: err_code = 'G0002' return (err_code, err_string) - raise osv.except_osv(_('CODA Import failed.'), err_string) - + raise osv.except_osv(_('CODA Import failed !'), err_string) + context.update({ 'bk_st_ids': bk_st_ids}) model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_import_result_view')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] self.write(cr, uid, ids, {'note': note}, context=context) - + return { 'name': _('Import CODA File result'), 'res_id': ids[0], @@ -941,10 +1340,26 @@ class account_coda_import(osv.osv_memory): 'type': 'ir.actions.act_window', } + def _statement_hook(self, cr, uid, coda_bank_params, st_vals, context=None): + """ + Use this method to take customer specific actions based upon the bank statement data. + Returns: + st_hook_error : False or string with error message + st_vals + """ + return False, st_vals + + def _st_line_hook(self, cr, uid, coda_bank_params, st_line_vals, context=None): + """ + Use this method to adapt the statement line created by the + CODA parsing to customer specific needs. + """ + return [st_line_vals] + def action_open_coda_statements(self, cr, uid, ids, context=None): if context is None: context = {} - module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements' + module, xml_id = 'account_coda', 'action_coda_bank_statements' res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id) action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context) domain = eval(action.get('domain') or '[]') @@ -962,11 +1377,21 @@ class account_coda_import(osv.osv_memory): domain += [('id','in', context.get('bk_st_ids', False))] action.update({'domain': domain}) return action - + account_coda_import() +def repl_special(s): + s = s.replace("\'", "\'" + "'") + return s + def str2date(date_str): - return time.strftime('%Y-%m-%d', time.strptime(date_str,'%d%m%y')) + try: + return time.strftime('%Y-%m-%d', time.strptime(date_str,'%d%m%y')) + except: + return False + +def str2time(time_str): + return time_str[:2] + ':' + time_str[2:] def str2float(str): try: @@ -975,9 +1400,517 @@ def str2float(str): return 0.0 def list2float(lst): - try: - return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst)) - except: - return 0.0 + try: + return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst)) + except: + return 0.0 -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +def number2float(s, d): + try: + return float(s[:len(s)-d] + '.' + s[len(s)-d:]) + except: + return False + +def _get_acc_numbers(acc_number): + #TODO this method is needed because the iban and bank account fields have been merged together. But sometimes we + # need to retrieve the normal bank account from the IBAN. This should be globalized and defined as a method on the + # bank account class. Each country part of the IBAN area should define its own code to do so. + acc_number = acc_number.replace(' ', '') + if acc_number.lower().startswith('be'): + return [acc_number[4:], acc_number] + return [acc_number] + +from base_iban.base_iban import _ref_iban, _format_iban + +def calc_iban_checksum(country, bban): + bban = bban.replace(' ', '').upper() + country.upper() + '00' + base = '' + for c in bban: + if c.isdigit(): + base += c + else: + base += str(ord(c) - ord('A') + 10) + kk = 98 - int(base) % 97 + return str(kk).rjust(2, '0') + +def check_bban(country, bban): + if country == 'BE': + try: + int(bban) + except: + return False + if len(bban) != 12: + return False + return True + +def check_iban(iban): + """ + Check the IBAN number (logic partially based upon base_iban module, cf. is_iban_valid method) + """ + iban = _format_iban(iban).lower() + if iban[:2] not in _ref_iban: + return False + if len(iban) != len(_format_iban(_ref_iban[iban[:2]])): + return False + #the four first digits have to be shifted to the end + iban = iban[4:] + iban[:4] + #letters have to be transformed into numbers (a = 10, b = 11, ...) + iban2 = "" + for char in iban: + if char.isalpha(): + iban2 += str(ord(char)-87) + else: + iban2 += char + #iban is correct if modulo 97 == 1 + return int(iban2) % 97 == 1 + +def get_bank(self, cr, uid, bic, iban): + + country_obj = self.pool.get('res.country') + bank_obj = self.pool.get('res.bank') + + bank_id = False + bank_name = False + feedback = False + bank_country = iban[:2] + try: + bank_country_id = country_obj.search(cr, uid, [('code', '=', bank_country)])[0] + except: + feedback = _("\n Bank lookup failed due to missing Country definition for Country Code '%s' !") \ + % (bank_country) + else: + if iban[:2] == 'BE' and 'code' in bank_obj.fields_get_keys(cr, uid): + # To DO : extend for other countries + bank_code = iban[4:7] + if bic: + bank_ids = bank_obj.search(cr, uid, [('bic', '=', bic), ('code', '=', bank_code), ('country', '=', bank_country_id)]) + if bank_ids: + bank_id = bank_ids[0] + else: + bank_id = bank_obj.create(cr, uid, { + 'name': bic, + 'code': bank_code, + 'bic': bic, + 'country': bank_country_id, + }) + else: + bank_ids = bank_obj.search(cr, uid, [('code', '=', bank_code), ('country', '=', bank_country_id)]) + if bank_ids: + bank_id = bank_ids[0] + bank_data = bank_obj.read(cr, uid, bank_id, fields=['bic', 'name']) + bic = bank_data['bic'] + bank_name = bank_data['name'] + else: + country = country_obj.browse(cr, uid, bank_country_id) + feedback = _("\n Bank lookup failed. Please define a Bank with Code '%s' and Country '%s' !") \ + % (bank_code, country.name) + else: + if not bic: + feedback = _("\n Bank lookup failed due to missing BIC in Bank Statement for IBAN '%s' !") \ + % (iban) + else: + bank_ids = bank_obj.search(cr, uid, [('bic', '=', bic), ('country', '=', bank_country_id)]) + if not bank_ids: + bank_name = bic + bank_id = bank_obj.create(cr, uid, { + 'name': bank_name, + 'bic': bic, + 'country': bank_country_id, + }) + else: + bank_id = bank_ids[0] + + return bank_id, bic, bank_name, feedback + +def update_partner_bank(self, cr, uid, bic, iban, partner_id, counterparty_name): + partner_bank_obj = self.pool.get('res.partner.bank') + bank_id = False + feedback = False + if check_iban(iban): + bank_id, bic, bank_name, feedback = get_bank(self, cr, uid, bic, iban) + if not bank_id: + return feedback + else: + bban = iban + #convert belgian BBAN numbers to IBAN + if check_bban('BE', iban): + kk = calc_iban_checksum('BE', iban) + iban = 'BE' + kk + iban + bank_id, bic, bank_name, feedback = get_bank(self, cr, uid, bic, iban) + if not bank_id: + return feedback + + if bank_id: + partner_bank_id = partner_bank_obj.create(cr, uid, { + 'partner_id': partner_id, + 'name': counterparty_name, + 'bank': bank_id, + 'state': 'iban', + 'bank_bic': bic, + 'bank_name': bank_name, + 'acc_number': iban, + }) + return feedback + +indent = '\n' + 8*' ' +st_line_name_families = ['13', '35', '41', '80'] +parse_comms_move = ['100', '101', '102', '103', '105', '106', '107', '108', '111', '113', '114', '115', '121', '122', '123', '124', '125', '126', '127'] +parse_comms_info = ['001', '002', '004', '005', '006', '007', '107', '008', '009', '010', '011'] + +def get_st_line_name(line, context): + #_logger.warn('get_st_line_name - entry').warn('ref = %s, family = %s, code = %s, categ = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category']) + st_line_name = line['name'] + + if line['trans_family'] == '35' and line['trans_code'] in ['01', '37']: + st_line_name = ', '.join([_('Closing'), line['trans_code_desc'], line['trans_category_desc']]) + + if line['trans_family'] in ['13', '41']: + st_line_name = ', '.join([line['trans_family_desc'], line['trans_code_desc'], line['trans_category_desc']]) + + if line['trans_family'] in ['80']: + st_line_name = ', '.join([line['trans_code_desc'], line['trans_category_desc']]) + + return st_line_name + +def parse_comm_move(self, cr, uid, line, comm_type_table, context): + #_logger.warn('parse_comm_move - entry, ref = %s, family = %s, code = %s, categ = %s, comm_type = %s, name = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category'], line['struct_comm_type'], line['name']) + comm_type = line['struct_comm_type'] + comm = st_line_comm = line['communication'] + st_line_name = line['name'] + + if comm_type in ['115', '121', '122', '126']: + _logger.warn('The parsing of Structured Commmunication Type %s has not yet been implemented. ' \ + 'Please contact Noviat (info@noviat.be) for more information about the development roadmap', comm_type) + + if comm_type == '100': + st_line_name = _('Payment with ISO 11649 structured format communication') + st_line_comm = '\n' + indent + _('Payment with a structured format communication applying the ISO standard 11649') + ':' + st_line_comm += indent + _('Structured creditor reference to remittance information') + st_line_comm += indent + comm + + if comm_type in ['101', '102']: + st_line_name = st_line_comm = '+++' + comm[0:3] + '/' + comm[3:7] + '/' + comm[7:12] + '+++' + + if comm_type == '103': + st_line_name = ', '.join([line['trans_family_desc'], _('Number')]) + st_line_comm = comm + + if comm_type == '105': + st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] + amount_1 = list2float(comm[0:15]) + amount_2 = list2float(comm[15:30]) + rate = number2float(comm[30:42], 8) + currency = comm[42:45] + struct_format_comm = comm[45:57].strip() + country_code = comm[57:59] + amount_3 = list2float(comm[59:74]) + st_line_comm = '\n' + indent + st_line_name + indent + _('Gross amount in the currency of the account') + ': %.2f' % amount_1 + st_line_comm += indent + _('Gross amount in the original currency') + ': %.2f' % amount_2 + st_line_comm += indent + _('Rate') + ': %.4f' % rate + st_line_comm += indent + _('Currency') + ': %s' % currency + st_line_comm += indent + _('Structured format communication') + ': %s' % struct_format_comm + st_line_comm += indent + _('Country code of the principal') + ': %s' % country_code + st_line_comm += indent + _('Equivalent in EUR') + ': %.2f' % amount_3 + + if comm_type == '106': + if not st_line_name and line['trans_family'] not in st_line_name_families: + st_line_name = _('VAT, withholding tax on income, commission, etc.') + interest = comm[30:42].strip('0') + st_line_comm = '\n' + indent + st_line_name + indent + _('Equivalent in the currency of the account') + ': %.2f' % list2float(comm[0:15]) + st_line_comm += indent + _('Amount on which % is calculated') + ': %.2f' % list2float(comm[15:30]) + st_line_comm += indent + _('Percent') + ': %.4f' % number2float(comm[30:42], 8) + st_line_comm += indent + (comm[42] == 1 and _('Minimum applicable') or _('Minimum not applicable')) + st_line_comm += indent + _('Equivalent in EUR') + ': %.2f' % list2float(comm[43:58]) + + if comm_type == '107': + paid_refusals = { + '0': _('paid'), + '1': _('direct debit cancelled or nonexistent'), + '2': _('refusal - other reason'), + 'D': _('payer disagrees'), + 'E': _('direct debit number linked to another identification number of the creditor')} + st_line_name = _('Direct debit - DOM\'80') + direct_debit_number = comm[0:12].strip() + pivot_date = str2date(comm[12:18]) + comm_zone = comm[18:48] + paid_refusal = paid_refusals.get(comm[48], '') + creditor_number = comm[49:60].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Direct Debit Number') + ': %s' % direct_debit_number + st_line_comm += indent + _('Central (Pivot) Date') + ': %s' % pivot_date + st_line_comm += indent + _('Communication Zone') + ': %s' % comm_zone + st_line_comm += indent + _('Paid or reason for refusal') + ': %s' % paid_refusal + st_line_comm += indent + _("Creditor's Number") + ': %s' % creditor_number + + if comm_type == '108': + st_line_name = _('Closing, period from %s to %s') % (str2date(comm[42:48]), str2date(comm[48:54])) + interest = comm[30:42].strip('0') + st_line_comm = '\n' + indent + st_line_name + indent + _('Equivalent in the currency of the account') + ': %.2f' % list2float(comm[0:15]) + if interest: + st_line_comm += indent + _('Interest rates, calculation basis') + ': %.2f' % list2float(comm[15:30]) + \ + indent + _('Interest') + ': %.2f' % list2float(comm[30:42]) + + if comm_type =='111': + card_schemes = { + '1': 'Bancontact/Mister Cash', + '2': _('Private'), + '3': 'Maestro', + '5': 'TINA', + '9': _('Other')} + trans_types = { + '1': _('Withdrawal'), + '2': _('Cumulative on network'), + '7': _('Distribution sector'), + '8': _('Teledata'), + '9': _('Fuel')} + st_line_name = _('POS credit - globalisation') + card_scheme = card_schemes.get(comm[0], '') + pos_number = comm[1:7].strip() + period_number = comm[7:10].strip() + first_sequence_number = comm[10:16].strip() + trans_first_date = str2date(comm[16:22]) + last_sequence_number = comm[22:28].strip() + trans_last_date = str2date(comm[28:34]) + trans_type = trans_types.get(comm[34], '') + terminal_name = comm[35:50].strip() + terminal_city = comm[51:60].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Card Scheme') + ': %s' % card_scheme + st_line_comm += indent + _('POS Number') + ': %s' % pos_number + st_line_comm += indent + _('Period Number') + ': %s' % period_number + st_line_comm += indent + _('First Transaction Sequence Number') + ': %s' % first_sequence_number + st_line_comm += indent + _('Date of first transaction') + ': %s' % trans_first_date + st_line_comm += indent + _('Last Transaction Sequence Number') + ': %s' % last_sequence_number + st_line_comm += indent + _('Date of last transaction') + ': %s' % trans_last_date + st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type + st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city + + if comm_type == '113': + card_schemes = { + '1': 'Bancontact/Mister Cash', + '2': 'Maestro', + '3': _('Private'), + '9': _('Other')} + trans_types = { + '1': _('Withdrawal'), + '2': _('Proton loading'), + '3': _('Reimbursement Proton balance'), + '4': _('Reversal of purchases'), + '7': _('Distribution sector'), + '8': _('Teledata'), + '9': _('Fuel')} + product_codes = { + '01': _('premium with lead substitute'), + '02': _('europremium'), + '03': _('diesel'), + '04': _('LPG'), + '06': _('premium plus 98 oct'), + '07': _('regular unleaded'), + '08': _('domestic fuel oil'), + '09': _('lubricants'), + '10': _('petrol'), + '11': _('premium 99+'), + '12': _('Avgas'), + '16': _('other types'), + } + st_line_name = _('ATM/POS debit') + card_number = comm[0:16].strip() + card_scheme = card_schemes.get(comm[16], '') + terminal_number = comm[17:23].strip() + sequence_number = comm[23:29].strip() + trans_date = comm[29:35].strip() and str2date(comm[29:35]) or '' + trans_hour = comm[35:39].strip() and str2time(comm[35:39]) or '' + trans_type = trans_types.get(comm[39], '') + terminal_name = comm[40:56].strip() + terminal_city = comm[56:66].strip() + orig_amount = comm[66:81].strip() and list2float(comm[66:81]) + rate = number2float(comm[81:93], 8) + currency = comm[93:96] + volume = number2float(comm[96:101], 2) + product_code = product_codes.get(comm[101:103], '') + unit_price = number2float(comm[103:108], 2) + st_line_comm = '\n' + indent + st_line_name + indent + _('Card Number') + ': %s' % card_number + st_line_comm += indent + _('Card Scheme') + ': %s' % card_scheme + if terminal_number: + st_line_comm += indent + _('Terminal Number') + ': %s' % terminal_number + st_line_comm += indent + _('Transaction Sequence Number') + ': %s' % sequence_number + st_line_comm += indent + _('Time') + ': %s' % trans_date + ' ' + trans_hour + st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type + st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city + if orig_amount: + st_line_comm += indent + _('Original Amount') + ': %.2f' % orig_amount + st_line_comm += indent + _('Rate') + ': %.4f' % rate + st_line_comm += indent + _('Currency') + ': %s' % currency + if volume: + st_line_comm += indent + _('Volume') + ': %.2f' % volume + if product_code: + st_line_comm += indent + _('Product Code') + ': %s' % product_code + if unit_price: + st_line_comm += indent + _('Unit Price') + ': %.2f' % unit_price + + if comm_type == '114': + card_schemes = { + '1': 'Bancontact/Mister Cash', + '2': 'Maestro', + '3': _('Private'), + '5': 'TINA', + '9': _('Other')} + trans_types = { + '1': _('Withdrawal'), + '7': _('Distribution sector'), + '8': _('Teledata'), + '9': _('Fuel')} + st_line_name = _('POS credit - individual transaction') + card_scheme = card_schemes.get(comm[0], '') + pos_number = comm[1:7].strip() + period_number = comm[7:10].strip() + sequence_number = comm[10:16].strip() + trans_date = str2date(comm[16:22]) + trans_hour = str2time(comm[22:26]) + trans_type = trans_types.get(comm[26], '') + terminal_name = comm[27:43].strip() + terminal_city = comm[43:53].strip() + trans_reference = comm[53:69].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Card Scheme') + ': %s' % card_scheme + st_line_comm += indent + _('POS Number') + ': %s' % pos_number + st_line_comm += indent + _('Period Number') + ': %s' % period_number + st_line_comm += indent + _('Transaction Sequence Number') + ': %s' % sequence_number + st_line_comm += indent + _('Time') + ': %s' % trans_date + ' ' + trans_hour + st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type + st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city + st_line_comm += indent + _('Transaction Reference') + ': %s' % trans_reference + + if comm_type == '123': + starting_date = str2date(comm[0:6]) + maturity_date = comm[6:12] == '999999' and _('guarantee without fixed term') or str2date(comm[0:6]) + basic_amount = list2float(comm[12:27]) + percent = number2float(comm[27:39], 8) + term = comm[39:43].lstrip('0') + minimum = comm[43] == '1' and True or False + guarantee_number = comm[44:57].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Starting Date') + ': %s' % starting_date + st_line_comm += indent + _('Maturity Date') + ': %s' % maturity_date + st_line_comm += indent + _('Basic Amount') + ': %.2f' % basic_amount + st_line_comm += indent + _('Percentage') + ': %.4f' % percent + st_line_comm += indent + _('Term in days') + ': %s' % term + st_line_comm += indent + (minimum and _('Minimum applicable') or _('Minimum not applicable')) + st_line_comm += indent + _('Guarantee Number') + ': %s' % guarantee_number + + if comm_type == '124': + card_issuers = { + '1': 'Mastercard', + '2': 'Visa', + '3': 'American Express', + '4': 'Diners Club', + '9': _('Other')} + st_line_name = _('Settlement credit cards') + card_number = comm[0:20].strip() + card_issuer = card_issuers.get(comm[20], '') + invoice_number = comm[21:33].strip() + identification_number = comm[33:48].strip() + date = comm[48:54].strip() and str2date(comm[48:54]) or '' + st_line_comm = '\n' + indent + st_line_name + indent + _('Card Number') + ': %s' % card_number + st_line_comm += indent + _('Issuing Institution') + ': %s' % card_issuer + st_line_comm += indent + _('Invoice Number') + ': %s' % invoice_number + st_line_comm += indent + _('Identification Number') + ': %s' % identification_number + st_line_comm += indent + _('Date') + ': %s' % date + + if comm_type == '125': + if line['trans_family'] not in st_line_name_families: + st_line_name = _('Credit') + credit_account = comm[0:27].strip() + if check_bban('BE', credit_account): + credit_account = '-'.join([credit_account[:3], credit_account[3:10], credit_account[10:]]) + old_balance = list2float(comm[27:42]) + new_balance = list2float(comm[42:57]) + amount = list2float(comm[57:72]) + currency = comm[72:75] + start_date = str2date(comm[75:81]) + end_date = str2date(comm[81:87]) + rate = number2float(comm[87:99], 8) + trans_reference = comm[99:112].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Credit Account Number') + ': %s' % credit_account + st_line_comm += indent + _('Old Balance') + ': %.2f' % old_balance + st_line_comm += indent + _('New Balance') + ': %.2f' % new_balance + st_line_comm += indent + _('Amount') + ': %.2f' % amount + st_line_comm += indent + _('Currency') + ': %s' % currency + st_line_comm += indent + _('Starting Date') + ': %s' % start_date + st_line_comm += indent + _('End Date') + ': %s' % end_date + st_line_comm += indent + _('Nominal Interest Rate or Rate of Charge') + ': %.4f' % rate + st_line_comm += indent + _('Transaction Reference') + ': %s' % trans_reference + + if comm_type == '127': + direct_debit_types = { + '0': _('unspecified'), + '1': _('recurrent'), + '2': _('one-off'), + '3': _('1-st (recurrent)'), + '4': _('last (recurrent)')} + direct_debit_schemes = { + '0': _('unspecified'), + '1': _('SEPA core'), + '2': _('SEPA B2B')} + paid_refusals = { + '0': _('paid'), + '1': _('technical problem'), + '2': _('refusal - reason not specified'), + '3': _('debtor disagrees'), + '4': _('debtor\'s account problem')} + R_types = { + '0': _('paid'), + '1': _('reject'), + '2': _('return'), + '3': _('refund'), + '4': _('reversal'), + '5': _('cancellation')} + st_line_name = _('European direct debit (SEPA)') + settlement_date = str2date(comm[0:6]) + direct_debit_type = direct_debit_types.get(comm[6], '') + direct_debit_scheme = direct_debit_schemes.get(comm[7], '') + paid_refusal = paid_refusals.get(comm[8], '') + creditor_id = comm[9:44].strip() + mandate_ref = comm[44:79].strip() + comm_zone = comm[79:141] + R_type = R_types.get(comm[141], '') + reason = comm[142:146].strip() + st_line_comm = '\n' + indent + st_line_name + indent + _('Settlement_Date') + ': %s' % settlement_date + st_line_comm += indent + _('Direct Debit Type') + ': %s' % direct_debit_type + st_line_comm += indent + _('Direct Debit Scheme') + ': %s' % direct_debit_scheme + st_line_comm += indent + _('Paid or reason for refusal') + ': %s' % paid_refusal + st_line_comm += indent + _('Creditor\'s Identification Code') + ': %s' % creditor_id + st_line_comm += indent + _('Mandate Reference') + ': %s' % mandate_ref + st_line_comm += indent + _('Communication') + ': %s' % comm_zone + st_line_comm += indent + _('R transaction Type') + ': %s' % R_type + st_line_comm += indent + _('Reason') + ': %s' % reason + + return st_line_name, st_line_comm + +def parse_comm_info(self, cr, uid, line, comm_type_table, context): + comm_type = line['struct_comm_type'] + comm = st_line_comm = line['communication'] + st_line_name = line['name'] + + if comm_type == '001': + st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] + st_line_comm = '\n' + indent + st_line_name + indent + _('Name') + ': %s' % comm[0:70].strip() + st_line_comm += indent + _('Street') + ': %s' % comm[70:105].strip() + st_line_comm += indent + _('Locality') + ': %s' % comm[105:140].strip() + st_line_comm += indent + _('Identification Code') + ': %s' % comm[140:175].strip() + + if comm_type in ['002', '004', '005']: + st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] + st_line_comm = comm.strip() + + if comm_type == '006': + amount_sign = comm[48] + amount = (comm[48] == '1' and '-' or '') + ('%.2f' % list2float(comm[33:48])) + ' ' + comm[30:33] + st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] + st_line_comm = '\n' + indent + st_line_name + indent + _('Description of the detail') + ': %s' % comm[0:30].strip() + st_line_comm += indent + _('Amount') + ': %s' % amount + st_line_comm += indent + _('Category') + ': %s' % comm[49:52].strip() + + if comm_type not in ['001', '002', '004', '005', '006']: + _logger.warn('The parsing of Structured Commmunication Type %s has not yet been implemented. ' \ + 'Please contact Noviat (info@noviat.be) for more information about the development roadmap', comm_type) + + return st_line_name, st_line_comm + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file From d963fb81869b60044c69bb56b0511accbc249b86 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 30 Nov 2012 20:29:38 +0100 Subject: [PATCH 03/32] [FIX]Delete name_company_uniq constraint in bank statement bzr revid: dle@openerp.com-20121130192938-qj9wu6iztkg7helz --- addons/l10n_be_coda/l10n_be_coda.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index f9dfa3a686a..f24536ab59f 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -347,9 +347,9 @@ class account_bank_statement(osv.osv): _columns = { 'coda_statement_id': fields.many2one('coda.bank.statement', 'Associated CODA Bank Statement'), } - _sql_constraints = [ - ('name_company_uniq', 'unique (name,company_id)', 'The name of the Bank Statement must be unique per company !') - ] + # _sql_constraints = [ + # ('name_company_uniq', 'unique (name,company_id)', 'The name of the Bank Statement must be unique per company !') + # ] def unlink(self, cr, uid, ids, context=None): if context is None: From 2bfd5ecdf750dfa4bcc1912ed9723e4228bc3ff5 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 3 Dec 2012 11:21:12 +0100 Subject: [PATCH 04/32] [FIX]Syntax according to sublime-linter, remove of unused variables bzr revid: dle@openerp.com-20121203102112-jsxy7th8v0bfolv4 --- addons/l10n_be_coda/l10n_be_coda.py | 200 +++--- addons/l10n_be_coda/res_bank.py | 5 +- .../wizard/account_coda_import.py | 586 +++++++++--------- 3 files changed, 406 insertions(+), 385 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index f24536ab59f..cc11c72cf06 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -26,12 +26,13 @@ from tools.translate import _ import logging _logger = logging.getLogger(__name__) + class coda_bank_account(osv.osv): - _name= 'coda.bank.account' - _description= 'CODA Bank Account Configuration' + _name = 'coda.bank.account' + _description = 'CODA Bank Account Configuration' def _check_account_pain(self, cr, uid, context=None): - res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_pain'), ('state','=','installed')]) + res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_pain'), ('state', '=', 'installed')]) return res and True or False def _check_currency(self, cr, uid, ids, context=None): @@ -45,7 +46,7 @@ class coda_bank_account(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), - 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True, + 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True, help='Bank Account Number.\nThe CODA import function will find its CODA processing parameters on this number.'), 'description1': fields.char('Primary Account Description', size=35, help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), @@ -53,15 +54,15 @@ class coda_bank_account(osv.osv): help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), 'state': fields.selection([ ('normal', 'Normal'), - ('info', 'Info')], + ('info', 'Info')], 'Type', required=True, select=1, help='No Bank Statements will be generated for CODA Bank Statements from Bank Accounts of type \'Info\'.'), - 'journal': fields.many2one('account.journal', 'Journal', - domain=[('type', '=', 'bank')], - states={'normal':[('required',True)],'info':[('required',False)]}, + 'journal': fields.many2one('account.journal', 'Journal', + domain=[('type', '=', 'bank')], + states={'normal': [('required', True)], 'info': [('required', False)]}, help='Bank Journal for the Bank Statement'), 'currency': fields.many2one('res.currency', 'Currency', required=True, - help='The currency of the CODA Bank Statement'), + help='The currency of the CODA Bank Statement'), 'coda_st_naming': fields.char('Bank Statement Naming Policy', size=64, help="Define the rules to create the name of the Bank Statements generated by the CODA processing." \ "\nE.g. %(code)s%(y)s/%(paper)s" \ @@ -73,14 +74,14 @@ class coda_bank_account(osv.osv): "\nPaper Statement sequence number (as specified on 'Old Balance' record): %(paper_ob)s" \ "\nPaper Statement sequence number (as specified on 'New Balance' record): %(paper)s"), 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', domain=[('type', '!=', 'view')], required=True, - help= 'Set here the default account that will be used if the partner cannot be unambiguously identified.'), + help='Set here the default account that will be used if the partner cannot be unambiguously identified.'), 'transfer_account': fields.many2one('account.account', 'Default Internal Transfer Account', domain=[('code', 'like', '58%'), ('type', '!=', 'view')], required=True, - help= 'Set here the default account that will be used for internal transfer between own bank accounts (e.g. transfer between current and deposit bank accounts).'), + help='Set here the default account that will be used for internal transfer between own bank accounts (e.g. transfer between current and deposit bank accounts).'), 'account_mapping_ids': fields.one2many('coda.account.mapping.rule', 'coda_bank_account_id', 'Account Mapping Rules'), - 'find_payment': fields.boolean('Lookup Payment Reference', + 'find_payment': fields.boolean('Lookup Payment Reference', help='Invoice lookup and reconciliation via the SEPA EndToEndReference.' \ '\nInstall the \'account_pain\' module if you want to take advantage of this feature.'), - 'find_bbacom': fields.boolean('Lookup Structured Communication of type \'BBA\'', + 'find_bbacom': fields.boolean('Lookup Structured Communication of type \'BBA\'', help='Partner lookup and reconciliation via the \'BBA\' Structured Communication.' \ '\nA partial reconciliation will be created when there is no exact match between the Invoice and Bank Transaction amounts.'), 'find_inv_number': fields.boolean('Lookup Invoice Number', @@ -93,22 +94,22 @@ class coda_bank_account(osv.osv): 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), 'discard_dup': fields.boolean('Discard Duplicates', - help="Duplicate Bank Statements will be discarded. Select the corresponding 'CODA Bank Statement' in order to view the contents of such duplicates."), + help="Duplicate Bank Statements will be discarded. Select the corresponding 'CODA Bank Statement' in order to view the contents of such duplicates."), 'active': fields.boolean('Active', help='If the active field is set to False, it will allow you to hide the Bank Account without removing it.'), 'company_id': fields.many2one('res.company', 'Company', required=True), } _defaults = { - 'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, + 'currency': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, 'state': 'normal', 'coda_st_naming': '%(code)s/%(y)s/%(coda)s', - 'active': True, + 'active': True, 'find_payment': _check_account_pain, 'find_bbacom': True, - 'find_inv_number': True, - 'find_partner': True, - 'update_partner': True, + 'find_inv_number': True, + 'find_partner': True, + 'update_partner': True, 'balance_start_enforce': True, - 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, + 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } _sql_constraints = [ ('account_uniq_1', 'unique (bank_id, description1, currency)', 'The combination of Bank Account, Account Description and Currency must be unique !'), @@ -133,42 +134,41 @@ class coda_bank_account(osv.osv): if not default: default = {} default = default.copy() - default.update({'journal_id': None}) + default.update({'journal_id': None}) default['description1'] = cba['description1'] or '' default['description2'] = cba['description2'] or '' default['name'] = (cba['name'] or '') + ' (copy)' - default['state'] = cba['state'] - return super(coda_bank_account, self).copy(cr, uid, id, default, context) + default['state'] = cba['state'] + return super(coda_bank_account, self).copy(cr, uid, id, default, context) def onchange_state(self, cr, uid, ids, state): - return state =='info' and {'value': {'journal': None}} or {} + return state == 'info' and {'value': {'journal': None}} or {} coda_bank_account() - class account_coda(osv.osv): _name = 'account.coda' _description = 'Object to store CODA Data Files' _order = 'coda_creation_date desc' _columns = { - 'name': fields.char('CODA Filename',size=128, readonly=True), + 'name': fields.char('CODA Filename', size=128, readonly=True), 'coda_data': fields.binary('CODA File', readonly=True), - 'statement_ids': fields.one2many('coda.bank.statement','coda_id','Generated CODA Bank Statements', readonly=True), + 'statement_ids': fields.one2many('coda.bank.statement', 'coda_id', 'Generated CODA Bank Statements', readonly=True), 'note': fields.text('Import Log', readonly=True), 'coda_creation_date': fields.date('CODA Creation Date', readonly=True, select=True), 'date': fields.date('Import Date', readonly=True, select=True), - 'user_id': fields.many2one('res.users','User', readonly=True, select=True), + 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True) } _defaults = { 'date': fields.date.context_today, - 'user_id': lambda self,cr,uid,context: uid, - 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c), - } + 'user_id': lambda self, cr, uid, context: uid, + 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c), + } _sql_constraints = [ ('coda_uniq', 'unique (name, coda_creation_date)', 'This CODA has already been imported !') - ] + ] def unlink(self, cr, uid, ids, context=None): if context is None: @@ -177,22 +177,23 @@ class account_coda(osv.osv): coda_st_obj = self.pool.get('coda.bank.statement') bank_st_obj = self.pool.get('account.bank.statement') for coda in self.browse(cr, uid, ids, context=context): - for coda_statement in coda.statement_ids: + for coda_statement in coda.statement_ids: if not context.get('coda_statement_unlink', False): if coda_st_obj.exists(cr, uid, coda_statement.id, context=context): - coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context) + coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context) if not context.get('bank_statement_unlink', False): if coda_st_obj.exists(cr, uid, coda_statement.id, context=context) and (coda_statement.type == 'normal') and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) + bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) context.update({'coda_unlink': False}) return super(account_coda, self).unlink(cr, uid, ids, context=context) - + account_coda() -class account_coda_trans_type(osv.osv): + +class account_coda_trans_type(osv.osv): _name = 'account.coda.trans.type' _description = 'CODA transaction type' - _rec_name = 'type' + _rec_name = 'type' _columns = { 'type': fields.char('Transaction Type', size=1, required=True), 'parent_id': fields.many2one('account.coda.trans.type', 'Parent'), @@ -200,49 +201,53 @@ class account_coda_trans_type(osv.osv): } account_coda_trans_type() -class account_coda_trans_code(osv.osv): + +class account_coda_trans_code(osv.osv): _name = 'account.coda.trans.code' _description = 'CODA transaction code' - _rec_name = 'code' + _rec_name = 'code' _columns = { 'code': fields.char('Code', size=2, required=True, select=1), 'type': fields.selection([ ('code', 'Transaction Code'), - ('family', 'Transaction Family')], - 'Type', required=True, select=1), + ('family', 'Transaction Family')], + 'Type', required=True, select=1), 'parent_id': fields.many2one('account.coda.trans.code', 'Family', select=1), 'description': fields.char('Description', size=128, translate=True, select=2), 'comment': fields.text('Comment', translate=True), } account_coda_trans_code() -class account_coda_trans_category(osv.osv): + +class account_coda_trans_category(osv.osv): _name = 'account.coda.trans.category' _description = 'CODA transaction category' - _rec_name = 'category' + _rec_name = 'category' _columns = { 'category': fields.char('Transaction Category', size=3, required=True), 'description': fields.char('Description', size=256, translate=True), } account_coda_trans_category() -class account_coda_comm_type(osv.osv): + +class account_coda_comm_type(osv.osv): _name = 'account.coda.comm.type' _description = 'CODA structured communication type' - _rec_name = 'code' + _rec_name = 'code' _columns = { 'code': fields.char('Structured Communication Type', size=3, required=True, select=1), 'description': fields.char('Description', size=128, translate=True), } _sql_constraints = [ - ('code_uniq', 'unique (code)','The Structured Communication Code must be unique !') + ('code_uniq', 'unique (code)', 'The Structured Communication Code must be unique !') ] account_coda_comm_type() + class coda_bank_statement(osv.osv): - _name = 'coda.bank.statement' - _description = 'CODA Bank Statement' - + _name = 'coda.bank.statement' + _description = 'CODA Bank Statement' + def _default_journal_id(self, cr, uid, context={}): if context.get('journal_id', False): return context['journal_id'] @@ -276,16 +281,16 @@ class coda_bank_statement(osv.osv): 'coda_id': fields.many2one('account.coda', 'CODA Data File', ondelete='cascade'), 'type': fields.selection([ ('normal', 'Normal'), - ('info', 'Info')], + ('info', 'Info')], 'Type', required=True, readonly=True, help='No Bank Statements are associated with CODA Bank Statements of type \'Info\'.'), - 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'), + 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, domain=[('type', '=', 'bank')]), - 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True), + 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True), 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True), 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'), readonly=True), 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), readonly=True), - 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'), + 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'), 'line_ids': fields.one2many('coda.bank.statement.line', 'statement_id', 'CODA Bank Statement lines', readonly=True), 'currency': fields.many2one('res.currency', 'Currency', required=True, readonly=True, @@ -293,14 +298,14 @@ class coda_bank_statement(osv.osv): 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { - 'type': 'normal', - 'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, + 'type': 'normal', + 'currency': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, 'journal_id': _default_journal_id, 'period_id': _get_period, } def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): - if context is None: + if context is None: context = {} res = super(coda_bank_statement, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) @@ -314,16 +319,16 @@ class coda_bank_statement(osv.osv): context.update({'coda_statement_unlink': True}) coda_obj = self.pool.get('account.coda') bank_st_obj = self.pool.get('account.bank.statement') - + # find all CODA bank statements that are associated with the selected CODA bank statements via a common CODA file - new_ids = [] + new_ids = [] for coda_statement in self.browse(cr, uid, ids, context=context): if coda_obj.exists(cr, uid, coda_statement.coda_id.id, context=context): new_ids += [x.id for x in coda_obj.browse(cr, uid, coda_statement.coda_id.id, context=context).statement_ids] - # unlink CODA banks statements as well as associated bank statements and CODA files + # unlink CODA banks statements as well as associated bank statements and CODA files for coda_statement in self.browse(cr, uid, new_ids, context=context): - if coda_statement.statement_id.state == 'confirm': + if coda_statement.statement_id.state == 'confirm': raise osv.except_osv(_('Invalid action !'), _("Cannot delete CODA Bank Statement '%s' of Journal '%s'." \ "\nThe associated Bank Statement has already been confirmed !" \ @@ -335,13 +340,14 @@ class coda_bank_statement(osv.osv): coda_obj.unlink(cr, uid, [coda_statement.coda_id.id], context=context) if not context.get('bank_statement_unlink', False): if coda_statement.statement_id and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) + bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) context.update({'coda_statement_unlink': False}) return super(coda_bank_statement, self).unlink(cr, uid, new_ids, context=context) - + coda_bank_statement() + class account_bank_statement(osv.osv): _inherit = 'account.bank.statement' _columns = { @@ -350,7 +356,7 @@ class account_bank_statement(osv.osv): # _sql_constraints = [ # ('name_company_uniq', 'unique (name,company_id)', 'The name of the Bank Statement must be unique per company !') # ] - + def unlink(self, cr, uid, ids, context=None): if context is None: context = {} @@ -359,15 +365,15 @@ class account_bank_statement(osv.osv): coda_st_obj = self.pool.get('coda.bank.statement') # find all statements that are associated with the selected bank statements via a common CODA file - ids_plus = [] + ids_plus = [] for statement in self.browse(cr, uid, ids, context=context): if statement.coda_statement_id: for x in coda_obj.browse(cr, uid, statement.coda_statement_id.coda_id.id, context=context).statement_ids: if x.type == 'normal': ids_plus += [x.statement_id.id] - + # unlink banks statements as well as associated CODA bank statements and CODA files - for statement in self.browse(cr, uid, ids_plus, context=context): + for statement in self.browse(cr, uid, ids_plus, context=context): if not context.get('coda_statement_unlink', False): if statement.coda_statement_id and coda_st_obj.exists(cr, uid, statement.coda_statement_id.id, context=context): coda_st_obj.unlink(cr, uid, [statement.coda_statement_id.id], context=context) @@ -381,52 +387,54 @@ class account_bank_statement(osv.osv): context.update({'bank_statement_unlink': False}) new_ids = list(set(ids + ids_plus)) return super(account_bank_statement, self).unlink(cr, uid, new_ids, context=context) - + account_bank_statement() + class coda_bank_statement_line(osv.osv): - _name = 'coda.bank.statement.line' - _order = 'sequence' + _name = 'coda.bank.statement.line' + _order = 'sequence' _description = 'CODA Bank Statement Line' _columns = { 'name': fields.char('Communication', size=268, required=True), 'sequence': fields.integer('Sequence'), 'date': fields.date('Entry Date', required=True), - 'val_date': fields.date('Valuta Date'), - 'account_id': fields.many2one('account.account','Account'), + 'val_date': fields.date('Valuta Date'), + 'account_id': fields.many2one('account.account', 'Account'), 'type': fields.selection([ - ('supplier','Supplier'), - ('customer','Customer'), - ('general','General'), - ('globalisation','Globalisation'), - ('information','Information'), - ('communication','Free Communication'), + ('supplier', 'Supplier'), + ('customer', 'Customer'), + ('general', 'General'), + ('globalisation', 'Globalisation'), + ('information', 'Information'), + ('communication', 'Free Communication'), ], 'Type', required=True), - 'globalisation_level': fields.integer('Globalisation Level', + 'globalisation_level': fields.integer('Globalisation Level', help="The value which is mentioned (1 to 9), specifies the hierarchy level" " of the globalisation of which this record is the first." "\nThe same code will be repeated at the end of the globalisation."), - 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')), + 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')), 'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID', readonly=True, - help="Code to identify transactions belonging to the same globalisation level within a batch payment"), + help="Code to identify transactions belonging to the same globalisation level within a batch payment"), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'partner_id': fields.many2one('res.partner', 'Partner'), 'counterparty_name': fields.char('Counterparty Name', size=35), - 'counterparty_bic': fields.char('Counterparty BIC', size=11), - 'counterparty_number': fields.char('Counterparty Number', size=34), - 'counterparty_currency': fields.char('Counterparty Currency', size=3), + 'counterparty_bic': fields.char('Counterparty BIC', size=11), + 'counterparty_number': fields.char('Counterparty Number', size=34), + 'counterparty_currency': fields.char('Counterparty Currency', size=3), 'payment_reference': fields.char('Payment Reference', size=35, help="Payment Reference. For SEPA (SCT or SDD) transactions, the PaymentInformationIdentification "\ "is recorded in this field pertaining to a globalisation, and the EndToEndReference for " \ - "simple transactions or for the details of a globalisation."), + "simple transactions or for the details of a globalisation."), 'statement_id': fields.many2one('coda.bank.statement', 'CODA Bank Statement', select=True, required=True, ondelete='cascade'), 'coda_bank_account_id': fields.related('statement_id', 'coda_bank_account_id', type='many2one', relation='coda.bank.account', string='Bank Account', store=True, readonly=True), 'ref': fields.char('Reference', size=32), 'note': fields.text('Notes'), - 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), + 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } + #TODO : Check this function. account_bank_statement_line Seems undefined : ) def unlink(self, cr, uid, ids, context=None): if context is None: context = {} @@ -434,7 +442,8 @@ class coda_bank_statement_line(osv.osv): raise osv.except_osv('Warning', _('Delete operation not allowed !')) return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context) -coda_bank_statement_line() +coda_bank_statement_line() + class account_bank_statement_line_global(osv.osv): _inherit = 'account.bank.statement.line.global' @@ -443,6 +452,7 @@ class account_bank_statement_line_global(osv.osv): } account_bank_statement_line_global() + class coda_account_mapping_rule(osv.osv): _name = 'coda.account.mapping.rule' _description = 'Rules Engine to assign accounts during CODA parsing' @@ -450,7 +460,7 @@ class coda_account_mapping_rule(osv.osv): _columns = { 'coda_bank_account_id': fields.many2one('coda.bank.account', 'CODA Bank Account', ondelete='cascade'), 'sequence': fields.integer('Sequence', help='Determines the order of the rules to assign accounts'), - 'name': fields.char('Rule Name', size=128, required=True), + 'name': fields.char('Rule Name', size=128, required=True), # matching criteria 'trans_type_id': fields.many2one('account.coda.trans.type', 'Transaction Type'), 'trans_family_id': fields.many2one('account.coda.trans.code', 'Transaction Family', domain=[('type', '=', 'family')]), @@ -465,18 +475,18 @@ class coda_account_mapping_rule(osv.osv): _defaults = { 'active': True, } - - def account_id_get(self, cr, uid, coda_bank_account_id, trans_type_id=None, trans_family_id=None, - trans_code_id=None, trans_category_id=None, struct_comm_type_id=None, partner_id=None, context=None): + + def account_id_get(self, cr, uid, coda_bank_account_id, trans_type_id=None, trans_family_id=None, + trans_code_id=None, trans_category_id=None, struct_comm_type_id=None, partner_id=None, context=None): cr.execute('SELECT account_id, trans_type_id, trans_family_id, trans_code_id, trans_category_id, struct_comm_type_id, partner_id ' \ 'FROM coda_account_mapping_rule ' \ 'WHERE active = TRUE AND coda_bank_account_id = %s ' \ 'ORDER BY sequence' % coda_bank_account_id ) - rules = cr.fetchall() + rules = cr.fetchall() condition = '(not rule[1] or (trans_type_id == rule[1])) and (not rule[2] or (trans_family_id == rule[2])) ' \ 'and (not rule[3] or (trans_code_id == rule[3])) and (not rule[4] or (trans_category_id == rule[4])) ' \ - 'and (not rule[5] or (struct_comm_type_id == rule[5])) and (not rule[6] or (partner_id == rule[6]))' + 'and (not rule[5] or (struct_comm_type_id == rule[5])) and (not rule[6] or (partner_id == rule[6]))' account_id = None for rule in rules: if eval(condition): diff --git a/addons/l10n_be_coda/res_bank.py b/addons/l10n_be_coda/res_bank.py index 6a3581539e9..47e7fdf8569 100755 --- a/addons/l10n_be_coda/res_bank.py +++ b/addons/l10n_be_coda/res_bank.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -22,6 +22,7 @@ from osv import fields, osv + class res_bank(osv.osv): _inherit = 'res.bank' _columns = { diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 6f055ca3d92..ea7558e13da 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -22,7 +22,7 @@ import time import base64 -from osv import fields,osv +from osv import fields, osv from tools.translate import _ import netsvc import re @@ -31,20 +31,21 @@ from sys import exc_info import logging _logger = logging.getLogger(__name__) + class account_coda_import(osv.osv_memory): _name = 'account.coda.import' _description = 'Import CODA File' _columns = { 'coda_data': fields.binary('CODA File', required=True), 'coda_fname': fields.char('CODA Filename', size=128, required=True), - 'note':fields.text('Log'), + 'note': fields.text('Log'), } _defaults = { 'coda_fname': lambda *a: '', } def _check_account_payment(self, cr, uid, context=None): - res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_payment'), ('state','=','installed')]) + res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_payment'), ('state', '=', 'installed')]) return res and True or False def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None): @@ -54,15 +55,15 @@ class account_coda_import(osv.osv_memory): codafile = str(codafile) codafilename = codafilename else: - data=self.browse(cr,uid,ids)[0] + data = self.browse(cr, uid, ids)[0] try: codafile = data.coda_data - codafilename = data.coda_fname + codafilename = data.coda_fname except: raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) return {} - currency_obj = self.pool.get('res.currency') + currency_obj = self.pool.get('res.currency') coda_bank_account_obj = self.pool.get('coda.bank.account') trans_type_obj = self.pool.get('account.coda.trans.type') trans_code_obj = self.pool.get('account.coda.trans.code') @@ -78,29 +79,25 @@ class account_coda_import(osv.osv_memory): bank_st_line_obj = self.pool.get('account.bank.statement.line') glob_obj = self.pool.get('account.bank.statement.line.global') inv_obj = self.pool.get('account.invoice') - move_obj = self.pool.get('account.move') move_line_obj = self.pool.get('account.move.line') voucher_obj = self.pool.get('account.voucher') - voucher_line_obj = self.pool.get('account.voucher.line') seq_obj = self.pool.get('ir.sequence') mod_obj = self.pool.get('ir.model.data') - partner_obj = self.pool.get('res.partner') account_mapping_obj = self.pool.get('coda.account.mapping.rule') - + if self._check_account_payment(cr, uid): payment_line_obj = self.pool.get('payment.line') else: payment_line_obj = False - + wf_service = netsvc.LocalService('workflow') - be_country_id = self.pool.get('res.country').search(cr, uid, [('code', '=', 'BE')])[0] coda_bank_table = coda_bank_account_obj.read(cr, uid, coda_bank_account_obj.search(cr, uid, []), context=context) for coda_bank in coda_bank_table: coda_bank.update({'journal_code': coda_bank['journal'] and journal_obj.browse(cr, uid, coda_bank['journal'][0], context=context).code or ''}) coda_bank.update({'iban': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).iban}) coda_bank.update({'acc_number': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).acc_number}) - coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name}) + coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name}) trans_type_table = trans_type_obj.read(cr, uid, trans_type_obj.search(cr, uid, []), context=context) trans_code_table = trans_code_obj.read(cr, uid, trans_code_obj.search(cr, uid, []), context=context) trans_category_table = trans_category_obj.read(cr, uid, trans_category_obj.search(cr, uid, []), context=context) @@ -112,9 +109,9 @@ class account_coda_import(osv.osv_memory): coda_statements = [] recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - + for line in recordlist: - + if not line: pass elif line[0] == '0': @@ -124,10 +121,10 @@ class account_coda_import(osv.osv_memory): coda_statement_lines = {} st_line_seq = 0 # header data - coda_statement['currency'] = 'EUR' # default currency + coda_statement['currency'] = 'EUR' # default currency coda_statement['version'] = line[127] coda_version = line[127] - if coda_version not in ['1','2']: + if coda_version not in ['1', '2']: err_string = _('\nCODA V%s statements are not supported, please contact your bank!') % coda_version err_code = 'R0001' if batch: @@ -137,10 +134,10 @@ class account_coda_import(osv.osv_memory): coda_statement['date'] = str2date(line[5:11]) coda_statement['coda_creation_date'] = str2date(line[5:11]) coda_statement['separate_application'] = line[83:88] - coda_statement['first_transaction_date'] = False + coda_statement['first_transaction_date'] = False coda_statement['state'] = 'draft' - - coda_id = coda_obj.search(cr, uid,[ + + coda_id = coda_obj.search(cr, uid, [ ('name', '=', codafilename), ('coda_creation_date', '=', coda_statement['date']), ]) @@ -151,7 +148,7 @@ class account_coda_import(osv.osv_memory): if batch: return (err_code, err_string) raise osv.except_osv(_('Warning !'), err_string) - + elif line[0] == '1': if coda_version == '1': coda_statement['acc_number'] = line[5:17] @@ -159,7 +156,7 @@ class account_coda_import(osv.osv_memory): coda_statement['currency'] = line[18:21] elif line[1] == '0': # Belgian bank account BBAN structure coda_statement['acc_number'] = line[5:17] - coda_statement['currency'] = line[18:21] + coda_statement['currency'] = line[18:21] elif line[1] == '1': # foreign bank account BBAN structure err_string = _('\nForeign bank accounts with BBAN structure are not supported !') err_code = 'R1001' @@ -167,7 +164,7 @@ class account_coda_import(osv.osv_memory): return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) elif line[1] == '2': # Belgian bank account IBAN structure - coda_statement['acc_number']=line[5:21] + coda_statement['acc_number'] = line[5:21] coda_statement['currency'] = line[39:42] elif line[1] == '3': # foreign bank account IBAN structure err_string = _('\nForeign bank accounts with IBAN structure are not supported !') @@ -184,22 +181,22 @@ class account_coda_import(osv.osv_memory): coda_statement['description'] = line[90:125].strip() cba_filter = lambda x: (coda_statement['acc_number'] in _get_acc_numbers(x['acc_number'])) \ and (coda_statement['currency'] == x['currency_name']) and (coda_statement['description'] in [x['description1'] or '', x['description2'] or '']) - coda_bank = filter(cba_filter, coda_bank_table) + coda_bank = filter(cba_filter, coda_bank_table) if coda_bank: - coda_bank = coda_bank[0] + coda_bank = coda_bank[0] coda_statement['type'] = coda_bank['state'] coda_statement['journal_id'] = coda_bank['journal'] and coda_bank['journal'][0] coda_statement['currency_id'] = coda_bank['currency'][0] - coda_statement['coda_bank_account_id'] = coda_bank['id'] - coda_statement['account_mapping_ids'] = coda_bank['account_mapping_ids'] - coda_statement['coda_bank_params'] = coda_bank + coda_statement['coda_bank_account_id'] = coda_bank['id'] + coda_statement['account_mapping_ids'] = coda_bank['account_mapping_ids'] + coda_statement['coda_bank_params'] = coda_bank awaiting_acc = coda_bank['awaiting_account'][0] transfer_acc = coda_bank['transfer_account'][0] find_payment = coda_bank['find_payment'] find_bbacom = coda_bank['find_bbacom'] - find_inv_number = coda_bank['find_inv_number'] + find_inv_number = coda_bank['find_inv_number'] find_partner = coda_bank['find_partner'] - update_partner = coda_bank['update_partner'] + update_partner = coda_bank['update_partner'] coda_statement['balance_start_enforce'] = coda_bank['balance_start_enforce'] coda_statement['discard_dup'] = coda_bank['discard_dup'] company_id = coda_bank['company_id'][0] @@ -217,7 +214,7 @@ class account_coda_import(osv.osv_memory): bal_start = list2float(line[43:58]) # old balance data if line[42] == '1': # 1= Debit bal_start = - bal_start - coda_statement['balance_start'] = bal_start + coda_statement['balance_start'] = bal_start coda_statement['old_balance_date'] = str2date(line[58:64]) coda_statement['acc_holder'] = line[64:90] coda_statement['paper_ob_seq_number'] = line[2:5] @@ -225,50 +222,50 @@ class account_coda_import(osv.osv_memory): elif line[0] == '2': # movement data record 2 - + if line[1] == '1': # movement data record 2.1 st_line = {} st_line_seq = st_line_seq + 1 st_line['sequence'] = st_line_seq st_line['type'] = 'general' - st_line['reconcile'] = False + st_line['reconcile'] = False st_line['trans_family'] = False st_line['struct_comm_type'] = '' st_line['struct_comm_type_id'] = 0 st_line['struct_comm_type_desc'] = '' st_line['struct_comm_bba'] = '' st_line['communication'] = '' - st_line['payment_reference'] = '' + st_line['payment_reference'] = '' st_line['partner_id'] = 0 st_line['account_id'] = 0 st_line['counterparty_name'] = '' - st_line['counterparty_bic'] = '' + st_line['counterparty_bic'] = '' st_line['counterparty_number'] = '' - st_line['counterparty_currency'] = '' + st_line['counterparty_currency'] = '' st_line['glob_lvl_flag'] = False st_line['globalisation_id'] = 0 st_line['globalisation_code'] = '' st_line['globalisation_amount'] = False st_line['amount'] = False - + st_line['ref'] = line[2:10] st_line['ref_move'] = line[2:6] st_line['ref_move_detail'] = line[6:10] - + if st_line_seq == 1: - main_move_stack = [st_line] # initialise main_move_stack (used to link 2.1 detail records to 2.1 main record - glob_lvl_stack = [0] # initialise globalisation stack + main_move_stack = [st_line] # initialise main_move_stack (used to link 2.1 detail records to 2.1 main record + glob_lvl_stack = [0] # initialise globalisation stack elif st_line['ref_move_detail'] == '0000': - glob_lvl_stack = [0] # re-initialise globalisation stack - + glob_lvl_stack = [0] # re-initialise globalisation stack + st_line['trans_ref'] = line[10:31] st_line_amt = list2float(line[32:47]) if line[31] == '1': # 1=debit st_line_amt = - st_line_amt - + st_line['trans_type'] = line[53] - trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table) + trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table) if not trans_type: err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type'] err_code = 'R2001' @@ -276,13 +273,13 @@ class account_coda_import(osv.osv_memory): return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) st_line['trans_type_id'] = trans_type[0]['id'] - st_line['trans_type_desc'] = trans_type[0]['description'] - - # processing of amount depending on globalisation code + st_line['trans_type_desc'] = trans_type[0]['description'] + + # processing of amount depending on globalisation code glob_lvl_flag = int(line[124]) - if glob_lvl_flag > 0: - if glob_lvl_stack[-1] == glob_lvl_flag: - st_line['glob_lvl_flag'] = glob_lvl_flag + if glob_lvl_flag > 0: + if glob_lvl_stack[-1] == glob_lvl_flag: + st_line['glob_lvl_flag'] = glob_lvl_flag st_line['amount'] = st_line_amt glob_lvl_stack.pop() else: @@ -292,7 +289,7 @@ class account_coda_import(osv.osv_memory): st_line['globalisation_amount'] = st_line_amt else: st_line['amount'] = st_line_amt - + # The 'globalisation' concept can also be implemented without the globalisation level flag. # This is e.g. used by Europabank to give the details of Card Payments. if st_line['ref_move'] == main_move_stack[-1]['ref_move']: @@ -303,7 +300,7 @@ class account_coda_import(osv.osv_memory): if batch: return (err_code, err_string) raise osv.except_osv(_('Data Error!'), err_string) - elif st_line['ref_move_detail'] != '0000': + elif st_line['ref_move_detail'] != '0000': if glob_lvl_stack[-1] == 0: # promote associated move record into a globalisation glob_lvl_flag = 1 @@ -319,7 +316,7 @@ class account_coda_import(osv.osv_memory): 'account_id': 0, }) main_move_stack[-1]['promoted'] = True - if not main_move_stack[-1].get('detail_cnt'): + if not main_move_stack[-1].get('detail_cnt'): main_move_stack[-1]['detail_cnt'] = 1 else: main_move_stack[-1]['detail_cnt'] += 1 @@ -328,17 +325,17 @@ class account_coda_import(osv.osv_memory): st_line['val_date'] = str2date(line[47:53]) # positions 54-61 : transaction code st_line['trans_family'] = line[54:56] - trans_family = filter(lambda x: (x['type'] == 'family') and (st_line['trans_family'] == x['code']), trans_code_table) + trans_family = filter(lambda x: (x['type'] == 'family') and (st_line['trans_family'] == x['code']), trans_code_table) if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] + err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] err_code = 'R2002' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) st_line['trans_family_id'] = trans_family[0]['id'] st_line['trans_family_desc'] = trans_family[0]['description'] st_line['trans_code'] = line[56:58] - trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), + trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), trans_code_table) if trans_code: st_line['trans_code_id'] = trans_code[0]['id'] @@ -347,17 +344,17 @@ class account_coda_import(osv.osv_memory): st_line['trans_code_id'] = None st_line['trans_code_desc'] = _('Transaction Code unknown, please consult your bank.') st_line['trans_category'] = line[58:61] - trans_category = filter(lambda x: st_line['trans_category'] == x['category'], trans_category_table) + trans_category = filter(lambda x: st_line['trans_category'] == x['category'], trans_category_table) if trans_category: st_line['trans_category_id'] = trans_category[0]['id'] st_line['trans_category_desc'] = trans_category[0]['description'] else: st_line['trans_category_id'] = None - st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 61-115 : communication + st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') + # positions 61-115 : communication if line[61] == '1': st_line['struct_comm_type'] = line[62:65] - comm_type = filter(lambda x: st_line['struct_comm_type'] == x['code'], comm_type_table) + comm_type = filter(lambda x: st_line['struct_comm_type'] == x['code'], comm_type_table) if not comm_type: err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % st_line['struct_comm_type'] err_code = 'R2003' @@ -368,28 +365,28 @@ class account_coda_import(osv.osv_memory): st_line['struct_comm_type_desc'] = comm_type[0]['description'] st_line['communication'] = st_line['name'] = line[65:115] if st_line['struct_comm_type'] in ['101', '102']: - bbacomm = line[65:77] - st_line['struct_comm_bba'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++' + bbacomm = line[65:77] + st_line['struct_comm_bba'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++' else: st_line['communication'] = st_line['name'] = line[62:115] st_line['entry_date'] = str2date(line[115:121]) if st_line['sequence'] == 1: coda_statement['first_transaction_date'] = st_line['entry_date'] - # positions 122-124 not processed - coda_statement_lines[st_line_seq] = st_line # store transaction - + # positions 122-124 not processed + coda_statement_lines[st_line_seq] = st_line # store transaction + if st_line['ref_move'] != main_move_stack[-1]['ref_move']: if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): # add closing globalisation level on previous detail record in order to correctly close # moves that have been 'promoted' to globalisation - closeglobalise = coda_statement['coda_statement_lines'][st_line_seq-1] + closeglobalise = coda_statement['coda_statement_lines'][st_line_seq - 1] closeglobalise.update({ 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], }) else: # demote record with globalisation code from 'globalisation' to 'general' when no detail records # the same logic is repeated on the New Balance Record ('8 Record') in order to cope with CODA files - # containing a single 2.1 record that needs to be 'demoted'. + # containing a single 2.1 record that needs to be 'demoted'. if main_move_stack[-1]['type'] == 'globalisation' and not main_move_stack[-1].get('detail_cnt'): # demote record with globalisation code from 'globalisation' to 'general' when no detail records main_st_line_seq = main_move_stack[-1]['sequence'] @@ -403,7 +400,7 @@ class account_coda_import(osv.osv_memory): main_move_stack.pop() main_move_stack.append(st_line) coda_statement['coda_statement_lines'] = coda_statement_lines - + elif line[1] == '2': # movement data record 2.2 if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: @@ -412,12 +409,12 @@ class account_coda_import(osv.osv_memory): err_code = 'R2004' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:63] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:63] coda_statement['coda_statement_lines'][st_line_seq]['payment_reference'] = line[63:98].strip() coda_statement['coda_statement_lines'][st_line_seq]['counterparty_bic'] = line[98:109].strip() - + elif line[1] == '3': # movement data record 2.3 if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: @@ -426,7 +423,7 @@ class account_coda_import(osv.osv_memory): err_code = 'R2005' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) st_line = coda_statement_lines[st_line_seq] if coda_version == '1': counterparty_number = line[10:22].strip() @@ -438,7 +435,7 @@ class account_coda_import(osv.osv_memory): counterparty_currency = line[23:26].strip() else: counterparty_number = line[10:44].strip() - counterparty_currency = line[44:47].strip() + counterparty_currency = line[44:47].strip() counterparty_name = line[47:82].strip() st_line['name'] += line[82:125] st_line['communication'] += line[82:125] @@ -447,20 +444,20 @@ class account_coda_import(osv.osv_memory): st_line['counterparty_name'] = counterparty_name """ TO DO: - + replace code infra by check on flag 128 and copy info in Notes Field. - + if counterparty_currency not in [coda_bank['currency_name'], '']: err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] + '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R2006' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) """ - # invoice matching and reconciliation - if st_line['type'] == 'general': + # invoice matching and reconciliation + if st_line['type'] == 'general': match = False payment_reference_match = False inv_ids = None @@ -480,17 +477,17 @@ class account_coda_import(osv.osv_memory): st_line['reconcile'] = payline.move_line_id.id st_line['account_id'] = payline.move_line_id.account_id.id if payline._get_ml_inv_ref: - inv_type = payline.ml_inv_ref.type + inv_type = payline.ml_inv_ref.type st_line['type'] = inv_type == 'in_invoice' and 'supplier' or 'customer' else: st_line['type'] = 'general' else: err_string = _('\nThe CODA parsing detected a payment reference ambiguity while processing movement data record 2.3, seq nr %s!' \ - '\nPlease check your Payment Gateway configuration or contact your OpenERP support channel.') % line[2:10] + '\nPlease check your Payment Gateway configuration or contact your OpenERP support channel.') % line[2:10] err_code = 'R2007' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) + raise osv.except_osv(_('Error!'), err_string) # check bba scor in bank statement line against open invoices if st_line['struct_comm_bba'] and find_bbacom: @@ -498,15 +495,15 @@ class account_coda_import(osv.osv_memory): domain = [('type', 'in', ['out_invoice', 'in_refund'])] else: domain = [('type', 'in', ['in_invoice', 'out_refund'])] - inv_ids = inv_obj.search(cr , uid, - domain + [('state', '=', 'open'), ('reference' ,'=', st_line['struct_comm_bba']), ('reference_type' ,'=', 'bba')]) + inv_ids = inv_obj.search(cr, uid, + domain + [('state', '=', 'open'), ('reference', '=', st_line['struct_comm_bba']), ('reference_type', '=', 'bba')]) if not inv_ids: coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ "\n There is no invoice matching the Structured Communication '%s'!" \ "\n Please verify and adjust the invoice and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ % (st_line['ref'], st_line['struct_comm_bba']) elif len(inv_ids) == 1: - match = True + match = True elif len(inv_ids) > 1: coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ "\n There are multiple invoices matching the Structured Communication '%s'!" \ @@ -527,7 +524,7 @@ class account_coda_import(osv.osv_memory): else: select2 = " AND type IN ('in_invoice', 'out_refund')" cr.execute(select + select2) - res=cr.fetchall() + res = cr.fetchall() if res: inv_ids = [x[0] for x in res] if len(inv_ids) == 1: @@ -548,26 +545,26 @@ class account_coda_import(osv.osv_memory): if st_line['amount'] > 0: select2 = " AND type = 'out_invoice' AND free_comm ilike '%'||number||'%'" cr.execute(select + select2) - res=cr.fetchall() + res = cr.fetchall() if res: inv_ids = [x[0] for x in res] - else: + else: select2 = " AND type = 'in_refund' AND free_comm ilike '%'||reference||'%'" cr.execute(select + select2) - res=cr.fetchall() + res = cr.fetchall() if res: inv_ids = [x[0] for x in res] # 'in_invoice', 'out_refund' else: select2 = " AND type = 'in_invoice' AND free_comm ilike '%'||reference||'%'" cr.execute(select + select2) - res=cr.fetchall() + res = cr.fetchall() if res: inv_ids = [x[0] for x in res] - else: + else: select2 = " AND type = 'out_refund' AND free_comm ilike '%'||number||'%'" cr.execute(select + select2) - res=cr.fetchall() + res = cr.fetchall() if res: inv_ids = [x[0] for x in res] if inv_ids: @@ -578,7 +575,7 @@ class account_coda_import(osv.osv_memory): "\n There are multiple invoices matching the Invoice Amount and Reference." \ "\n A manual reconciliation is required.") \ % (st_line['ref']) - + if not payment_reference_match and match and inv_ids and len(inv_ids) == 1: invoice = inv_obj.browse(cr, uid, inv_ids[0]) partner = invoice.partner_id @@ -594,27 +591,27 @@ class account_coda_import(osv.osv_memory): st_line['reconcile'] = iml_ids[0] else: err_string = _('\nThe CODA parsing detected a database inconsistency while processing movement data record 2.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] + '\nPlease report this issue via your OpenERP support channel.') % line[2:10] err_code = 'R2008' if batch: return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - - # lookup partner via counterparty_number when invoice lookup failed + raise osv.except_osv(_('Error!'), err_string) + + # lookup partner via counterparty_number when invoice lookup failed if not match and counterparty_number: - transfer_account = filter(lambda x: counterparty_number in x, company_bank_accounts) + transfer_account = filter(lambda x: counterparty_number in x, company_bank_accounts) if transfer_account: st_line['account_id'] = transfer_acc match = True elif find_partner: - partner_bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number)]) + partner_bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', counterparty_number)]) if not match and find_partner and partner_bank_ids: if len(partner_bank_ids) > 1: coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'!" \ "\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ % (st_line['ref'], counterparty_number) - else: + else: partner_bank = partner_bank_obj.browse(cr, uid, partner_bank_ids[0], context) st_line['partner_id'] = partner_bank.partner_id.id match = True @@ -634,21 +631,21 @@ class account_coda_import(osv.osv_memory): coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ "\n No matching partner record found!" \ "\n Please adjust the corresponding entry manually in the generated Bank Statement.") \ - % (st_line['ref']) + % (st_line['ref']) st_line['account_id'] = awaiting_acc - + # add bank account to partner record if match and st_line['account_id'] != transfer_acc and counterparty_number and update_partner: - partner_bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number), ('partner_id', '=', st_line['partner_id'])], order='id') + partner_bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', counterparty_number), ('partner_id', '=', st_line['partner_id'])], order='id') if len(partner_bank_ids) > 1: # clean up partner bank duplicates, keep most recently created - _logger.warn('Duplicate Bank Accounts for partner_id %s have been removed, ids = %s', + _logger.warn('Duplicate Bank Accounts for partner_id %s have been removed, ids = %s', st_line['partner_id'], partner_bank_ids[:-1]) - partner_bank_obj.unlink(cr,uid, partner_bank_ids[:-1]) + partner_bank_obj.unlink(cr, uid, partner_bank_ids[:-1]) if not partner_bank_ids: feedback = update_partner_bank(self, cr, uid, st_line['counterparty_bic'], counterparty_number, st_line['partner_id'], counterparty_name) - if feedback: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':") % st_line['ref'] + feedback + if feedback: + coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':") % st_line['ref'] + feedback coda_statement_lines[st_line_seq] = st_line coda_statement['coda_statement_lines'] = coda_statement_lines @@ -660,18 +657,18 @@ class account_coda_import(osv.osv_memory): err_code = 'R2009' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) elif line[0] == '3': # information data record 3 - + if line[1] == '1': # information data record 3.1 info_line = {} info_line['entry_date'] = st_line['entry_date'] info_line['type'] = 'information' st_line_seq = st_line_seq + 1 - info_line['sequence'] = st_line_seq + info_line['sequence'] = st_line_seq info_line['struct_comm_type'] = '' info_line['struct_comm_type_desc'] = '' info_line['communication'] = '' @@ -679,37 +676,37 @@ class account_coda_import(osv.osv_memory): info_line['trans_ref'] = line[10:31] # positions 32-38 : transaction code info_line['trans_type'] = line[31] - trans_type = filter(lambda x: info_line['trans_type'] == x['type'], trans_type_table) + trans_type = filter(lambda x: info_line['trans_type'] == x['type'], trans_type_table) if not trans_type: err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type'] err_code = 'R3001' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - info_line['trans_type_desc'] = trans_type[0]['description'] + raise osv.except_osv(_('Data Error!'), err_string) + info_line['trans_type_desc'] = trans_type[0]['description'] info_line['trans_family'] = line[32:34] - trans_family = filter(lambda x: (x['type'] == 'family') and (info_line['trans_family'] == x['code']), trans_code_table) + trans_family = filter(lambda x: (x['type'] == 'family') and (info_line['trans_family'] == x['code']), trans_code_table) if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] + err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] err_code = 'R3002' if batch: return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) + raise osv.except_osv(_('Data Error!'), err_string) info_line['trans_family_desc'] = trans_family[0]['description'] info_line['trans_code'] = line[34:36] - trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), + trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), trans_code_table) if trans_code: info_line['trans_code_desc'] = trans_code[0]['description'] else: info_line['trans_code_desc'] = _('Transaction Code unknown, please consult your bank.') info_line['trans_category'] = line[36:39] - trans_category = filter(lambda x: info_line['trans_category'] == x['category'], trans_category_table) + trans_category = filter(lambda x: info_line['trans_category'] == x['category'], trans_category_table) if trans_category: info_line['trans_category_desc'] = trans_category[0]['description'] else: - info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 40-113 : communication + info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') + # positions 40-113 : communication if line[39] == '1': info_line['struct_comm_type'] = line[40:43] comm_type = filter(lambda x: info_line['struct_comm_type'] == x['code'], comm_type_table) @@ -726,7 +723,7 @@ class account_coda_import(osv.osv_memory): # positions 114-128 not processed coda_statement_lines[st_line_seq] = info_line coda_statement['coda_statement_lines'] = coda_statement_lines - + elif line[1] == '2': # information data record 3.2 if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: @@ -736,9 +733,9 @@ class account_coda_import(osv.osv_memory): if batch: return (err_code, err_string) raise osv.except_osv(_('Error!'), err_string) - coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115] + coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:115] - + elif line[1] == '3': # information data record 3.3 if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: @@ -750,7 +747,7 @@ class account_coda_import(osv.osv_memory): raise osv.except_osv(_('Error!'), err_string) coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:100] coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:100] - + elif line[0] == '4': # free communication data record 4 comm_line = {} @@ -761,11 +758,11 @@ class account_coda_import(osv.osv_memory): comm_line['communication'] = comm_line['name'] = line[32:112] coda_statement_lines[st_line_seq] = comm_line coda_statement['coda_statement_lines'] = coda_statement_lines - + elif line[0] == '8': # new balance record last_transaction = main_move_stack[-1] - if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): + if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): # demote record with globalisation code from 'globalisation' to 'general' when no detail records main_st_line_seq = main_move_stack[-1]['sequence'] to_demote = coda_statement['coda_statement_lines'][main_st_line_seq] @@ -778,7 +775,7 @@ class account_coda_import(osv.osv_memory): # add closing globalisation level on previous detail record in order to correctly close # moves that have been 'promoted' to globalisation if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): - closeglobalise = coda_statement['coda_statement_lines'][st_line_seq-1] + closeglobalise = coda_statement['coda_statement_lines'][st_line_seq - 1] closeglobalise.update({ 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], }) @@ -788,10 +785,10 @@ class account_coda_import(osv.osv_memory): if line[41] == '1': # 1=Debit bal_end = - bal_end coda_statement['balance_end_real'] = bal_end - if coda_statement['new_balance_date']: - period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['new_balance_date']), ('date_stop','>=',coda_statement['new_balance_date'])]) + if coda_statement['new_balance_date']: + period_id = period_obj.search(cr, uid, [('date_start', '<=', coda_statement['new_balance_date']), ('date_stop', '>=', coda_statement['new_balance_date'])]) else: - period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['date']), ('date_stop','>=',coda_statement['date'])]) + period_id = period_obj.search(cr, uid, [('date_start', '<=', coda_statement['date']), ('date_stop', '>=', coda_statement['date'])]) if not period_id: err_string = _("\nThe CODA Statement New Balance date doesn't fall within a defined Accounting Period!" \ "\nPlease create the Accounting Period for date %s.") % coda_statement['new_balance_date'] @@ -802,7 +799,7 @@ class account_coda_import(osv.osv_memory): coda_statement['period_id'] = period_id[0] if coda_bank['coda_st_naming']: coda_statement['name'] = coda_bank['coda_st_naming'] % { - 'code': coda_bank['journal_code'] or '', + 'code': coda_bank['journal_code'] or '', 'year': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][:4] or coda_statement['date'][:4], 'y': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][2:4] or coda_statement['date'][2:4], 'coda': coda_statement['coda_seq_number'], @@ -811,14 +808,14 @@ class account_coda_import(osv.osv_memory): } else: coda_statement['name'] = '/' - + elif line[0] == '9': # footer record - coda_statement['balance_min'] = list2float(line[22:37]) + coda_statement['balance_min'] = list2float(line[22:37]) coda_statement['balance_plus'] = list2float(line[37:52]) if not bal_end: coda_statement['balance_end_real'] = coda_statement['balance_start'] + coda_statement['balance_plus'] - coda_statement['balance_min'] - if coda_parsing_note: + if coda_parsing_note: coda_statement['coda_parsing_note'] = '\nStatement Line matching results:' + coda_parsing_note else: coda_statement['coda_parsing_note'] = '' @@ -826,28 +823,28 @@ class account_coda_import(osv.osv_memory): #end for err_string = '' - err_code = '' + err_code = '' coda_id = 0 coda_note = '' line_note = '' - + try: - coda_id = coda_obj.create(cr, uid,{ - 'name' : codafilename, + coda_id = coda_obj.create(cr, uid, { + 'name': codafilename, 'coda_data': codafile, - 'coda_creation_date' : coda_statement['date'], + 'coda_creation_date': coda_statement['date'], 'date': fields.date.context_today(self, cr, uid, context=context), 'user_id': uid, }) context.update({'coda_id': coda_id}) - + except osv.except_osv, e: cr.rollback() err_string = _('\nApplication Error : ') + str(e) except Exception, e: cr.rollback() err_string = _('\nSystem Error : ') + str(e) - except : + except: cr.rollback() err_string = _('\nUnknown Error : ') + str(e) if err_string: @@ -859,40 +856,40 @@ class account_coda_import(osv.osv_memory): nb_err = 0 err_string = '' coda_st_ids = [] - bk_st_ids = [] - + bk_st_ids = [] + for statement in coda_statements: - + # The CODA Statement info is written to two objects: 'coda.bank.statement' and 'account.bank.statement' try: normal2info = False lines = statement['coda_statement_lines'] - if not statement['first_transaction_date']: - normal2info = True # don't create a bank statement for CODA's without transactions + if not statement['first_transaction_date']: + normal2info = True # don't create a bank statement for CODA's without transactions else: line_vals = [x for x in lines.itervalues()] transactions = filter(lambda x: (x['type'] in ['globalisation', 'general', 'supplier', 'customer']) and x['amount'], line_vals) if not transactions: - normal2info = True # don't create a bank statement for CODA's without transactions + normal2info = True # don't create a bank statement for CODA's without transactions if normal2info: - statement['type'] = 'info' # don't create a bank statement for CODA's without transactions + statement['type'] = 'info' # don't create a bank statement for CODA's without transactions statement['coda_parsing_note'] += _("\n\nThe CODA Statement %s does not contain transactions, hence no Bank Statement has been created." \ "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ - %(statement['name'], statement['name']) - + % (statement['name'], statement['name']) + coda_st_id = coda_st_obj.create(cr, uid, { 'name': statement['name'], 'type': statement['type'], 'coda_bank_account_id': statement['coda_bank_account_id'], - 'currency': statement['currency_id'], + 'currency': statement['currency_id'], 'journal_id': statement['journal_id'], 'coda_id': coda_id, 'date': statement['date'], 'coda_creation_date': statement['coda_creation_date'], 'period_id': statement['period_id'], 'old_balance_date': statement['old_balance_date'], - 'new_balance_date': statement['new_balance_date'], + 'new_balance_date': statement['new_balance_date'], 'balance_start': statement['balance_start'], 'balance_end_real': statement['balance_end_real'], }) @@ -904,10 +901,10 @@ class account_coda_import(osv.osv_memory): dup_ids = bank_st_obj.search(cr, uid, [('name', '=', statement['name']), ('company_id', '=', company_id)]) if dup_ids: discard = True - statement['type'] = 'info' # don't create a bank statement for duplicates + statement['type'] = 'info' # don't create a bank statement for duplicates statement['coda_parsing_note'] += _("\n\nThe Bank Statement %s already exists, hence no duplicate Bank Statement has been created." \ "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ - %(statement['name'], statement['name']) + % (statement['name'], statement['name']) # create only bank statement for CODA's of type 'normal' if statement['type'] == 'normal' and not discard: @@ -924,16 +921,16 @@ class account_coda_import(osv.osv_memory): if journal.default_debit_account_id and (journal.default_credit_account_id == journal.default_debit_account_id): balance_start_check = journal.default_debit_account_id.balance else: - nb_err += 1 + nb_err += 1 err_string += _('\nConfiguration Error in journal %s!' \ '\nPlease verify the Default Debit and Credit Account settings.') % journal.name break - if balance_start_check <> statement['balance_start']: + if balance_start_check != statement['balance_start']: balance_start_err_string = _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!') \ - % (statement['name'], statement['balance_start'], balance_start_check, journal.name) + % (statement['name'], statement['balance_start'], balance_start_check, journal.name) if statement['balance_start_enforce']: - nb_err += 1 - err_string += balance_start_err_string + nb_err += 1 + err_string += balance_start_err_string break else: statement['coda_parsing_note'] += '\n' + balance_start_err_string @@ -950,89 +947,90 @@ class account_coda_import(osv.osv_memory): } st_hook_error, st_vals = self._statement_hook(cr, uid, statement['coda_bank_params'], st_vals, context=context) if st_hook_error: - nb_err += 1 - err_string += st_hook_error + nb_err += 1 + err_string += st_hook_error break bk_st_id = bank_st_obj.create(cr, uid, st_vals, context=context) bk_st_ids.append(bk_st_id) coda_st_obj.write(cr, uid, [coda_st_id], {'statement_id': bk_st_id}, context=context) - + st_line_seq = 0 for x in lines: line = lines[x] - + if not line['type'] == 'communication': if line['trans_family'] in st_line_name_families: - line['name'] = get_st_line_name(line, context) + line['name'] = get_st_line_name(line, context) if line['type'] == 'information': if line['struct_comm_type'] in parse_comms_info: line['name'], line['communication'] = parse_comm_info(self, cr, uid, line, comm_type_table, context) elif line['struct_comm_type'] in parse_comms_move: - line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) + line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) elif line['struct_comm_type'] in parse_comms_move: line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) # handling non-transactional records : line['type'] in ['information', 'communication'] - + if line['type'] == 'information': - line['globalisation_id'] = glob_id_stack[-1][2] + #Check if this line can be deleted. glob_id_stack marked as undefined here + #line['globalisation_id'] = glob_id_stack[-1][2] line_note = _('Transaction Type' ': %s - %s' \ '\nTransaction Family: %s - %s' \ '\nTransaction Code: %s - %s' \ '\nTransaction Category: %s - %s' \ '\nStructured Communication Type: %s - %s' \ '\nCommunication: %s') \ - %(line['trans_type'], line['trans_type_desc'], + % (line['trans_type'], line['trans_type_desc'], line['trans_family'], line['trans_family_desc'], line['trans_code'], line['trans_code_desc'], line['trans_category'], line['trans_category_desc'], line['struct_comm_type'], line['struct_comm_type_desc'], line['communication']) - - coda_st_line_id = coda_st_line_obj.create(cr, uid, { + + coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', - 'type' : 'information', - 'date': line['entry_date'], + 'type': 'information', + 'date': line['entry_date'], 'statement_id': coda_st_id, 'note': line_note, }) - + elif line['type'] == 'communication': line_note = _('Free Communication:\n %s') \ - %(line['communication']) - - coda_st_line_id = coda_st_line_obj.create(cr, uid, { + % (line['communication']) + + coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', - 'type' : 'communication', + 'type': 'communication', 'date': statement['date'], 'statement_id': coda_st_id, 'note': line_note, }) - # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer'] + # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer'] else: - + if line['ref_move_detail'] == '0000': glob_id_stack = [(0, '', 0, '')] # initialise stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) - + glob_lvl_flag = line['glob_lvl_flag'] - if glob_lvl_flag: - if glob_id_stack[-1][0] == glob_lvl_flag: + if glob_lvl_flag: + if glob_id_stack[-1][0] == glob_lvl_flag: line['globalisation_id'] = glob_id_stack[-1][2] glob_id_stack.pop() else: glob_name = line['name'].strip() or '/' glob_code = seq_obj.get(cr, uid, 'statement.line.global') glob_id = glob_obj.create(cr, uid, { - 'code': glob_code, + 'code': glob_code, 'name': glob_name, 'type': 'coda', 'parent_id': glob_id_stack[-1][2], @@ -1041,7 +1039,7 @@ class account_coda_import(osv.osv_memory): }) line['globalisation_id'] = glob_id glob_id_stack.append((glob_lvl_flag, glob_code, glob_id, glob_name)) - + line_note = _('Partner Name: %s \nPartner Account Number: %s' \ '\nTransaction Type: %s - %s' \ '\nTransaction Family: %s - %s' \ @@ -1050,64 +1048,64 @@ class account_coda_import(osv.osv_memory): '\nStructured Communication Type: %s - %s' \ '\nPayment Reference: %s' \ '\nCommunication: %s') \ - %(line['counterparty_name'], line['counterparty_number'], + % (line['counterparty_name'], line['counterparty_number'], line['trans_type'], line['trans_type_desc'], line['trans_family'], line['trans_family_desc'], line['trans_code'], line['trans_code_desc'], line['trans_category'], line['trans_category_desc'], line['struct_comm_type'], line['struct_comm_type_desc'], - line['payment_reference'], + line['payment_reference'], line['communication']) - + if line['type'] == 'globalisation': - - coda_st_line_id = coda_st_line_obj.create(cr, uid, { + + coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], + 'ref': line['ref'], 'name': line['name'].strip() or '/', - 'type' : 'globalisation', - 'val_date' : line['val_date'], + 'type': 'globalisation', + 'val_date': line['val_date'], 'date': line['entry_date'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_amount': line['globalisation_amount'], - 'globalisation_id': line['globalisation_id'], + 'globalisation_level': line['glob_lvl_flag'], + 'globalisation_amount': line['globalisation_amount'], + 'globalisation_id': line['globalisation_id'], 'partner_id': line['partner_id'] or 0, 'account_id': line['account_id'], - 'payment_reference': line['payment_reference'], + 'payment_reference': line['payment_reference'], 'statement_id': coda_st_id, 'note': line_note, }) - else: # line['type'] in ['general', 'supplier', 'customer'] + else: # line['type'] in ['general', 'supplier', 'customer'] - if glob_lvl_flag == 0: + if glob_lvl_flag == 0: line['globalisation_id'] = glob_id_stack[-1][2] - if not line['account_id']: + if not line['account_id']: line['account_id'] = awaiting_acc - - coda_st_line_id = coda_st_line_obj.create(cr, uid, { + + coda_st_line_obj.create(cr, uid, { 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'].strip() or '/', - 'type' : line['type'], - 'val_date' : line['val_date'], + 'ref': line['ref'], + 'name': line['name'].strip() or '/', + 'type': line['type'], + 'val_date': line['val_date'], 'date': line['entry_date'], 'amount': line['amount'], 'partner_id': line['partner_id'] or 0, 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], + 'counterparty_bic': line['counterparty_bic'], + 'counterparty_number': line['counterparty_number'], + 'counterparty_currency': line['counterparty_currency'], 'account_id': line['account_id'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_id': line['globalisation_id'], - 'payment_reference': line['payment_reference'], + 'globalisation_level': line['glob_lvl_flag'], + 'globalisation_id': line['globalisation_id'], + 'payment_reference': line['payment_reference'], 'statement_id': coda_st_id, 'note': line_note, }) if statement['type'] == 'normal': - if line['amount'] != 0.0: + if line['amount'] != 0.0: st_line_seq += 1 voucher_id = False line_name = line['name'].strip() @@ -1116,9 +1114,9 @@ class account_coda_import(osv.osv_memory): line_name = glob_id_stack[-1][3] or '/' else: line_name = '/' - + if line['reconcile']: - + move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) company_currency_id = journal.company_id.currency_id.id currency_id = journal.currency.id @@ -1128,11 +1126,11 @@ class account_coda_import(osv.osv_memory): multi_currency = False context_multi_currency = context.copy() context_multi_currency.update({'date': line['entry_date']}) - + line_cr_ids = [] line_dr_ids = [] - amount_remaining = abs(line['amount']) - + amount_remaining = abs(line['amount']) + #for entry in entries: if move_line.reconcile_partial_id: amount_original = abs(move_line.amount_residual_currency) @@ -1142,7 +1140,7 @@ class account_coda_import(osv.osv_memory): if move_line.currency_id and move_line.amount_currency: amount_original = abs(move_line.amount_currency) else: - amount_original = currency_obj.compute(cr, uid, company_currency_id, currency_id, original_amount, context=context_multi_currency) + amount_original = currency_obj.compute(cr, uid, company_currency_id, currency_id, amount_original, context=context_multi_currency) if amount_remaining > 0: amount_voucher_line = min(amount_original, abs(amount_remaining)) amount_remaining -= amount_voucher_line @@ -1160,8 +1158,8 @@ class account_coda_import(osv.osv_memory): line_cr_ids += [(0, 0, voucher_line_vals)] else: line_dr_ids += [(0, 0, voucher_line_vals)] - - voucher_vals = { + + voucher_vals = { 'type': line['type'] == 'supplier' and 'payment' or 'receipt', 'name': line_name, 'date': line['val_date'], @@ -1179,9 +1177,9 @@ class account_coda_import(osv.osv_memory): 'number': statement['name'] + '/' + str(st_line_seq), 'partner_id': line['partner_id'], } - + #_logger.warn('voucher_vals=%s, context=%s', voucher_vals, context) - context['journal_id'] = journal.id # add journal to context for __get_payment_rate_currency method + context['journal_id'] = journal.id # add journal to context for __get_payment_rate_currency method if line_cr_ids or line_dr_ids: voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context) else: @@ -1205,25 +1203,25 @@ class account_coda_import(osv.osv_memory): line['account_id'] = account_id st_line_vals = { - 'ref': line['ref'], + 'ref': line['ref'], 'name': line_name, - 'type' : line['type'], - 'val_date' : line['val_date'], + 'type': line['type'], + 'val_date': line['val_date'], 'date': line['entry_date'], 'amount': line['amount'], 'partner_id': line['partner_id'] or 0, 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], + 'counterparty_bic': line['counterparty_bic'], + 'counterparty_number': line['counterparty_number'], + 'counterparty_currency': line['counterparty_currency'], 'account_id': line['account_id'], - 'globalisation_id': line['globalisation_id'], - 'payment_reference': line['payment_reference'], + 'globalisation_id': line['globalisation_id'], + 'payment_reference': line['payment_reference'], 'statement_id': bk_st_id, 'voucher_id': voucher_id, 'note': line_note, } - + st_lines_vals = self._st_line_hook(cr, uid, statement['coda_bank_params'], st_line_vals, context=context) if not st_lines_vals: # removal of lines by the _coda_parsing_hook currently not supported : @@ -1234,7 +1232,7 @@ class account_coda_import(osv.osv_memory): for st_line_vals in st_lines_vals: # To DO : update sequence of statement lines and naming of associated vouchers/moves when the hook returns multiple lines st_line_vals.update({'sequence': st_line_seq}) - bank_st_line_id = bank_st_line_obj.create(cr, uid, st_line_vals, context=context) + bank_st_line_obj.create(cr, uid, st_line_vals, context=context) if st_line_vals['voucher_id']: voucher = voucher_obj.browse(cr, uid, st_line_vals['voucher_id'], context=context) move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) @@ -1247,7 +1245,7 @@ class account_coda_import(osv.osv_memory): coda_st_obj.write(cr, uid, [coda_st_id], {}, context=context) # calculate balance st_balance = coda_st_obj.read(cr, uid, coda_st_id, ['balance_end', 'balance_end_real'], context=context) - if st_balance['balance_end'] <> st_balance['balance_end_real']: + if st_balance['balance_end'] != st_balance['balance_end_real']: err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s!') \ % (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description'])) if statement['type'] == 'normal': @@ -1255,9 +1253,9 @@ class account_coda_import(osv.osv_memory): break else: statement['coda_parsing_note'] += '\n' + err_string - - if statement['type'] == 'normal': - bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance + + if statement['type'] == 'normal': + bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance journal_name = journal.name else: journal_name = _('None') @@ -1270,16 +1268,16 @@ class account_coda_import(osv.osv_memory): '\nAccount Holder Name: %s' \ '\nDate: %s, Starting Balance: %.2f, Ending Balance: %.2f' \ '%s') \ - %(journal_name, + % (journal_name, coda_version, statement['coda_seq_number'], statement['paper_nb_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description']), statement['acc_holder'], statement['date'], float(statement['balance_start']), float(statement['balance_end_real']), - statement['coda_parsing_note'] % {'name':coda_statement['name']}) + statement['coda_parsing_note'] % {'name': coda_statement['name']}) if statement.get('separate_application') != '00000': - coda_note += _('\nCode Separate Application: %s') %statement['separate_application'] \ + coda_note += _('\nCode Separate Application: %s') % statement['separate_application'] \ except osv.except_osv, e: cr.rollback() @@ -1293,25 +1291,25 @@ class account_coda_import(osv.osv_memory): nb_err += 1 err_string += _('\nSystem Error : ') + str(e) tb = ''.join(format_exception(*exc_info())) - _logger.error('System Error while processing Statement %s\n%s', - statement.get('name', '/'),tb) - except : + _logger.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.error('Unknown Error while processing Statement %s\n%s', - statement.get('name', '/'),tb) + statement.get('name', '/'), tb) # end 'for statement in coda_statements' - + coda_note_header = _('CODA File is Imported :') coda_note_footer = _('\n\nNumber of statements : ') + str(len(coda_st_ids)) err_log = err_log + _('\nNumber of errors : ') + str(nb_err) + '\n' if not nb_err: note = coda_note_header + coda_note + coda_note_footer - coda_obj.write(cr, uid,[coda_id],{'note': note }) + coda_obj.write(cr, uid, [coda_id], {'note': note}) cr.commit() if batch: return None @@ -1321,12 +1319,12 @@ class account_coda_import(osv.osv_memory): err_code = 'G0002' return (err_code, err_string) raise osv.except_osv(_('CODA Import failed !'), err_string) - - context.update({ 'bk_st_ids': bk_st_ids}) + + context.update({'bk_st_ids': bk_st_ids}) model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_import_result_view')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] self.write(cr, uid, ids, {'note': note}, context=context) - + return { 'name': _('Import CODA File result'), 'res_id': ids[0], @@ -1341,16 +1339,16 @@ class account_coda_import(osv.osv_memory): } def _statement_hook(self, cr, uid, coda_bank_params, st_vals, context=None): - """ + """ Use this method to take customer specific actions based upon the bank statement data. Returns: st_hook_error : False or string with error message - st_vals + st_vals """ return False, st_vals def _st_line_hook(self, cr, uid, coda_bank_params, st_line_vals, context=None): - """ + """ Use this method to adapt the statement line created by the CODA parsing to customer specific needs. """ @@ -1374,43 +1372,50 @@ class account_coda_import(osv.osv_memory): res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id) action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context) domain = eval(action.get('domain') or '[]') - domain += [('id','in', context.get('bk_st_ids', False))] + domain += [('id', 'in', context.get('bk_st_ids', False))] action.update({'domain': domain}) return action - + account_coda_import() + def repl_special(s): s = s.replace("\'", "\'" + "'") return s + def str2date(date_str): try: - return time.strftime('%Y-%m-%d', time.strptime(date_str,'%d%m%y')) + return time.strftime('%Y-%m-%d', time.strptime(date_str, '%d%m%y')) except: return False + def str2time(time_str): return time_str[:2] + ':' + time_str[2:] + def str2float(str): try: return float(str) except: return 0.0 + def list2float(lst): try: - return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst)) + return str2float((lambda s: s[:-3] + '.' + s[-3:])(lst)) except: return 0.0 + def number2float(s, d): try: - return float(s[:len(s)-d] + '.' + s[len(s)-d:]) + return float(s[:len(s) - d] + '.' + s[len(s) - d:]) except: return False + def _get_acc_numbers(acc_number): #TODO this method is needed because the iban and bank account fields have been merged together. But sometimes we # need to retrieve the normal bank account from the IBAN. This should be globalized and defined as a method on the @@ -1422,6 +1427,7 @@ def _get_acc_numbers(acc_number): from base_iban.base_iban import _ref_iban, _format_iban + def calc_iban_checksum(country, bban): bban = bban.replace(' ', '').upper() + country.upper() + '00' base = '' @@ -1433,16 +1439,18 @@ def calc_iban_checksum(country, bban): kk = 98 - int(base) % 97 return str(kk).rjust(2, '0') + def check_bban(country, bban): if country == 'BE': try: int(bban) except: - return False + return False if len(bban) != 12: return False return True + def check_iban(iban): """ Check the IBAN number (logic partially based upon base_iban module, cf. is_iban_valid method) @@ -1458,20 +1466,21 @@ def check_iban(iban): iban2 = "" for char in iban: if char.isalpha(): - iban2 += str(ord(char)-87) + iban2 += str(ord(char) - 87) else: iban2 += char #iban is correct if modulo 97 == 1 return int(iban2) % 97 == 1 + def get_bank(self, cr, uid, bic, iban): - country_obj = self.pool.get('res.country') + country_obj = self.pool.get('res.country') bank_obj = self.pool.get('res.bank') bank_id = False bank_name = False - feedback = False + feedback = False bank_country = iban[:2] try: bank_country_id = country_obj.search(cr, uid, [('code', '=', bank_country)])[0] @@ -1505,7 +1514,7 @@ def get_bank(self, cr, uid, bic, iban): feedback = _("\n Bank lookup failed. Please define a Bank with Code '%s' and Country '%s' !") \ % (bank_code, country.name) else: - if not bic: + if not bic: feedback = _("\n Bank lookup failed due to missing BIC in Bank Statement for IBAN '%s' !") \ % (iban) else: @@ -1518,10 +1527,11 @@ def get_bank(self, cr, uid, bic, iban): 'country': bank_country_id, }) else: - bank_id = bank_ids[0] - + bank_id = bank_ids[0] + return bank_id, bic, bank_name, feedback - + + def update_partner_bank(self, cr, uid, bic, iban, partner_id, counterparty_name): partner_bank_obj = self.pool.get('res.partner.bank') bank_id = False @@ -1531,7 +1541,6 @@ def update_partner_bank(self, cr, uid, bic, iban, partner_id, counterparty_name) if not bank_id: return feedback else: - bban = iban #convert belgian BBAN numbers to IBAN if check_bban('BE', iban): kk = calc_iban_checksum('BE', iban) @@ -1541,22 +1550,23 @@ def update_partner_bank(self, cr, uid, bic, iban, partner_id, counterparty_name) return feedback if bank_id: - partner_bank_id = partner_bank_obj.create(cr, uid, { + partner_bank_obj.create(cr, uid, { 'partner_id': partner_id, 'name': counterparty_name, 'bank': bank_id, 'state': 'iban', 'bank_bic': bic, - 'bank_name': bank_name, + 'bank_name': bank_name, 'acc_number': iban, }) return feedback -indent = '\n' + 8*' ' +indent = '\n' + 8 * ' ' st_line_name_families = ['13', '35', '41', '80'] parse_comms_move = ['100', '101', '102', '103', '105', '106', '107', '108', '111', '113', '114', '115', '121', '122', '123', '124', '125', '126', '127'] parse_comms_info = ['001', '002', '004', '005', '006', '007', '107', '008', '009', '010', '011'] + def get_st_line_name(line, context): #_logger.warn('get_st_line_name - entry').warn('ref = %s, family = %s, code = %s, categ = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category']) st_line_name = line['name'] @@ -1572,6 +1582,7 @@ def get_st_line_name(line, context): return st_line_name + def parse_comm_move(self, cr, uid, line, comm_type_table, context): #_logger.warn('parse_comm_move - entry, ref = %s, family = %s, code = %s, categ = %s, comm_type = %s, name = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category'], line['struct_comm_type'], line['name']) comm_type = line['struct_comm_type'] @@ -1628,7 +1639,7 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): '1': _('direct debit cancelled or nonexistent'), '2': _('refusal - other reason'), 'D': _('payer disagrees'), - 'E': _('direct debit number linked to another identification number of the creditor')} + 'E': _('direct debit number linked to another identification number of the creditor')} st_line_name = _('Direct debit - DOM\'80') direct_debit_number = comm[0:12].strip() pivot_date = str2date(comm[12:18]) @@ -1649,7 +1660,7 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): st_line_comm += indent + _('Interest rates, calculation basis') + ': %.2f' % list2float(comm[15:30]) + \ indent + _('Interest') + ': %.2f' % list2float(comm[30:42]) - if comm_type =='111': + if comm_type == '111': card_schemes = { '1': 'Bancontact/Mister Cash', '2': _('Private'), @@ -1781,10 +1792,10 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): if comm_type == '123': starting_date = str2date(comm[0:6]) maturity_date = comm[6:12] == '999999' and _('guarantee without fixed term') or str2date(comm[0:6]) - basic_amount = list2float(comm[12:27]) + basic_amount = list2float(comm[12:27]) percent = number2float(comm[27:39], 8) term = comm[39:43].lstrip('0') - minimum = comm[43] == '1' and True or False + minimum = comm[43] == '1' and True or False guarantee_number = comm[44:57].strip() st_line_comm = '\n' + indent + st_line_name + indent + _('Starting Date') + ': %s' % starting_date st_line_comm += indent + _('Maturity Date') + ': %s' % maturity_date @@ -1793,7 +1804,7 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): st_line_comm += indent + _('Term in days') + ': %s' % term st_line_comm += indent + (minimum and _('Minimum applicable') or _('Minimum not applicable')) st_line_comm += indent + _('Guarantee Number') + ': %s' % guarantee_number - + if comm_type == '124': card_issuers = { '1': 'Mastercard', @@ -1812,7 +1823,7 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): st_line_comm += indent + _('Invoice Number') + ': %s' % invoice_number st_line_comm += indent + _('Identification Number') + ': %s' % identification_number st_line_comm += indent + _('Date') + ': %s' % date - + if comm_type == '125': if line['trans_family'] not in st_line_name_families: st_line_name = _('Credit') @@ -1836,31 +1847,31 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): st_line_comm += indent + _('End Date') + ': %s' % end_date st_line_comm += indent + _('Nominal Interest Rate or Rate of Charge') + ': %.4f' % rate st_line_comm += indent + _('Transaction Reference') + ': %s' % trans_reference - + if comm_type == '127': direct_debit_types = { '0': _('unspecified'), '1': _('recurrent'), '2': _('one-off'), '3': _('1-st (recurrent)'), - '4': _('last (recurrent)')} + '4': _('last (recurrent)')} direct_debit_schemes = { '0': _('unspecified'), '1': _('SEPA core'), - '2': _('SEPA B2B')} + '2': _('SEPA B2B')} paid_refusals = { '0': _('paid'), '1': _('technical problem'), '2': _('refusal - reason not specified'), '3': _('debtor disagrees'), - '4': _('debtor\'s account problem')} + '4': _('debtor\'s account problem')} R_types = { '0': _('paid'), '1': _('reject'), '2': _('return'), '3': _('refund'), '4': _('reversal'), - '5': _('cancellation')} + '5': _('cancellation')} st_line_name = _('European direct debit (SEPA)') settlement_date = str2date(comm[0:6]) direct_debit_type = direct_debit_types.get(comm[6], '') @@ -1880,14 +1891,15 @@ def parse_comm_move(self, cr, uid, line, comm_type_table, context): st_line_comm += indent + _('Communication') + ': %s' % comm_zone st_line_comm += indent + _('R transaction Type') + ': %s' % R_type st_line_comm += indent + _('Reason') + ': %s' % reason - + return st_line_name, st_line_comm + def parse_comm_info(self, cr, uid, line, comm_type_table, context): comm_type = line['struct_comm_type'] comm = st_line_comm = line['communication'] st_line_name = line['name'] - + if comm_type == '001': st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] st_line_comm = '\n' + indent + st_line_name + indent + _('Name') + ': %s' % comm[0:70].strip() @@ -1900,7 +1912,6 @@ def parse_comm_info(self, cr, uid, line, comm_type_table, context): st_line_comm = comm.strip() if comm_type == '006': - amount_sign = comm[48] amount = (comm[48] == '1' and '-' or '') + ('%.2f' % list2float(comm[33:48])) + ' ' + comm[30:33] st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] st_line_comm = '\n' + indent + st_line_name + indent + _('Description of the detail') + ': %s' % comm[0:30].strip() @@ -1912,5 +1923,4 @@ def parse_comm_info(self, cr, uid, line, comm_type_table, context): 'Please contact Noviat (info@noviat.be) for more information about the development roadmap', comm_type) return st_line_name, st_line_comm - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 5d44b0f624c6fe354529a4aa265d9bca373daff1 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 3 Dec 2012 17:51:39 +0100 Subject: [PATCH 05/32] [FIX]Unexisting payment reference, wrong operator in sql req bzr revid: dle@openerp.com-20121203165139-qov9jfk91wxv3qb9 --- addons/l10n_be_coda/l10n_be_coda_view.xml | 2 +- addons/l10n_be_coda/wizard/account_coda_import.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index fb0a12b73fb..1ef09862c3d 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -246,7 +246,7 @@ - + diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index ea7558e13da..5a1b530d38c 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -913,7 +913,7 @@ class account_coda_import(osv.osv_memory): balance_start_check_date = statement['first_transaction_date'] or statement['date'] cr.execute('SELECT balance_end_real \ FROM account_bank_statement \ - WHERE journal_id = %s and date < %s \ + WHERE journal_id = %s and date <= %s \ ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'], balance_start_check_date)) res = cr.fetchone() balance_start_check = res and res[0] @@ -975,7 +975,7 @@ class account_coda_import(osv.osv_memory): if line['type'] == 'information': #Check if this line can be deleted. glob_id_stack marked as undefined here - #line['globalisation_id'] = glob_id_stack[-1][2] + line['globalisation_id'] = glob_id_stack[-1][2] line_note = _('Transaction Type' ': %s - %s' \ '\nTransaction Family: %s - %s' \ '\nTransaction Code: %s - %s' \ @@ -1035,7 +1035,6 @@ class account_coda_import(osv.osv_memory): 'type': 'coda', 'parent_id': glob_id_stack[-1][2], 'amount': line['globalisation_amount'], - 'payment_reference': line['payment_reference'] }) line['globalisation_id'] = glob_id glob_id_stack.append((glob_lvl_flag, glob_code, glob_id, glob_name)) @@ -1201,7 +1200,6 @@ class account_coda_import(osv.osv_memory): account_id = account_mapping_obj.account_id_get(cr, uid, **kwargs) if account_id: line['account_id'] = account_id - st_line_vals = { 'ref': line['ref'], 'name': line_name, @@ -1216,7 +1214,6 @@ class account_coda_import(osv.osv_memory): 'counterparty_currency': line['counterparty_currency'], 'account_id': line['account_id'], 'globalisation_id': line['globalisation_id'], - 'payment_reference': line['payment_reference'], 'statement_id': bk_st_id, 'voucher_id': voucher_id, 'note': line_note, From 0b32c75f74bec07d3e52fa2651a1929cc168e79b Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Tue, 4 Dec 2012 18:59:48 +0100 Subject: [PATCH 06/32] [REF]Whole code of coda parser bzr revid: dle@openerp.com-20121204175948-ckz5s05dgqgv0tq1 --- addons/account/account_bank_statement.py | 2 +- addons/l10n_be_coda/wizard/__init__.py | 2 +- .../wizard/account_coda_import.py | 7 +- .../wizard/account_coda_import_dle.py | 331 ++++++++++++++++++ 4 files changed, 339 insertions(+), 3 deletions(-) create mode 100644 addons/l10n_be_coda/wizard/account_coda_import_dle.py diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index e7e3f740067..60f2b230c05 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -546,7 +546,7 @@ class account_bank_statement_line(osv.osv): _name = "account.bank.statement.line" _description = "Bank Statement Line" _columns = { - 'name': fields.char('Communication', size=64, required=True), + 'name': fields.char('Communication', size=256, required=True), 'date': fields.date('Date', required=True), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'type': fields.selection([ diff --git a/addons/l10n_be_coda/wizard/__init__.py b/addons/l10n_be_coda/wizard/__init__.py index e3038609b80..3851606707b 100644 --- a/addons/l10n_be_coda/wizard/__init__.py +++ b/addons/l10n_be_coda/wizard/__init__.py @@ -20,6 +20,6 @@ # ############################################################################## -import account_coda_import +import account_coda_import_dle # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 5a1b530d38c..fdd56204f77 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -973,6 +973,8 @@ class account_coda_import(osv.osv_memory): # handling non-transactional records : line['type'] in ['information', 'communication'] if line['type'] == 'information': + if line['ref_move_detail'] == '0000': + glob_id_stack = [(0, '', 0, '')] # initialise stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) #Check if this line can be deleted. glob_id_stack marked as undefined here line['globalisation_id'] = glob_id_stack[-1][2] @@ -1349,12 +1351,15 @@ class account_coda_import(osv.osv_memory): Use this method to adapt the statement line created by the CODA parsing to customer specific needs. """ + print 'PLZ DISPLAY SOMETHING RIGHTPLZPLZPLZ' + print st_line_vals['name'] + print st_line_vals['counterparty_name'] return [st_line_vals] def action_open_coda_statements(self, cr, uid, ids, context=None): if context is None: context = {} - module, xml_id = 'account_coda', 'action_coda_bank_statements' + module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements' res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id) action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context) domain = eval(action.get('domain') or '[]') diff --git a/addons/l10n_be_coda/wizard/account_coda_import_dle.py b/addons/l10n_be_coda/wizard/account_coda_import_dle.py new file mode 100644 index 00000000000..be8bb147698 --- /dev/null +++ b/addons/l10n_be_coda/wizard/account_coda_import_dle.py @@ -0,0 +1,331 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import base64 +from osv import fields, osv +from tools.translate import _ +import time +import tools +import logging +_logger = logging.getLogger(__name__) + + +class account_coda_import(osv.osv_memory): + _name = 'account.coda.import' + _description = 'Import CODA File' + _columns = { + 'coda_data': fields.binary('CODA File', required=True), + 'coda_fname': fields.char('CODA Filename', size=128, required=True), + 'note': fields.text('Log'), + } + _defaults = { + 'coda_fname': lambda *a: '', + } + + def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None): + if context is None: + context = {} + if batch: + codafile = str(codafile) + codafilename = codafilename + else: + data = self.browse(cr, uid, ids)[0] + try: + codafile = data.coda_data + codafilename = data.coda_fname + except: + raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) + return {} + recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') + statements = [] + for line in recordlist: + if not line: + continue + elif line[0] == '0': + #Begin of a new Bank statement + statement = {} + statements.append(statement) + statement['error'] = False + statement['errors'] = [] + statement['version'] = line[127] + if statement['version'] not in ['1', '2']: + statement['error'] = True + statement['errors'].append(('R0001', _('CODA V%s statements are not supported, please contact your bank!') % statement['version'])) + continue + statement['lines'] = [] + statement['date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[5:11]), '%d%m%y')) + statement['separateApplication'] = rmspaces(line[83:88]) + elif not statement['error']: + if line[0] == '1': + #Statement details + if statement['version'] == '1': + statement['accountNumber'] = rmspaces(line[5:17]) + statement['currency'] = rmspaces(line[18:21]) + elif statement['version'] == '2': + if line[1] == '0': # Belgian bank account BBAN structure + statement['accountNumber'] = rmspaces(line[5:17]) + statement['currency'] = rmspaces(line[18:21]) + elif line[1] == '1': # foreign bank account BBAN structure + statement['error'] = True + statement['errors'].append(('R1001', _('Foreign bank accounts with BBAN structure are not supported !'))) + continue + elif line[1] == '2': # Belgian bank account IBAN structure + statement['accountNumber'] = rmspaces(line[5:21]) + statement['currency'] = rmspaces(line[39:42]) + elif line[1] == '3': # foreign bank account IBAN structure + statement['error'] = True + statement['errors'].append(('R1002', _('Foreign bank accounts with IBAN structure are not supported !'))) + continue + else: # Something else, not supported + statement['error'] = True + statement['errors'].append(('R1003', _('\nUnsupported bank account structure !'))) + continue + statement['description'] = rmspaces(line[90:125]) + statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 + statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) + statement['accountHolder'] = rmspaces(line[64:90]) + statement['paperSeqNumber'] = rmspaces(line[2:5]) + statement['codaSeqNumber'] = rmspaces(line[125:128]) + elif line[0] == '2': + if line[1] == '1': + #New statement line + statementLine = {} + statementLine['type'] = 'general' + statementLine['ref'] = rmspaces(line[2:10]) + statementLine['ref_move'] = rmspaces(line[2:6]) + statementLine['ref_move_detail'] = rmspaces(line[6:10]) + statementLine['sequence'] = len(statement['lines']) + 1 + if statementLine['sequence'] == 1: + main_move_stack = [statementLine] + glob_lvl_stack = [0] # initialise globalisation stack + elif statementLine['ref_move_detail'] == '0000': + glob_lvl_stack = [0] # re-initialise globalisation stack + statementLine['transactionRef'] = rmspaces(line[10:31]) + statementLine['debit'] = line[31] # 0 = Credit, 1 = Debit + statementLine['amount'] = float(rmspaces(line[32:47])) / 1000 + if statementLine['debit'] == '1': + statementLine['amount'] = - statementLine['amount'] + statementLine['transactionType'] = line[53] + #TODO Handling severals transactions types + statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) + statementLine['transactionFamily'] = rmspaces(line[54:56]) + #TODO Handling severals transactions Family + statementLine['transactionCode'] = rmspaces(line[56:58]) + #TODO Handling severals transactions code + statementLine['transactionCategory'] = rmspaces(line[58:61]) + #TODO Handling severals transactions category + statementLine['communication'] = rmspaces(line[65:115]) + #TODO Handling structured communication + statementLine['entryDate'] = rmspaces(line[115:121]) + + glob_lvl_flag = int(line[124]) + if glob_lvl_flag > 0: + if glob_lvl_stack[-1] == glob_lvl_flag: + statementLine['glob_lvl_flag'] = glob_lvl_flag + statementLine['amount'] = statementLine['amount'] + glob_lvl_stack.pop() + else: + glob_lvl_stack.append(glob_lvl_flag) + statementLine['type'] = 'globalisation' + statementLine['glob_lvl_flag'] = glob_lvl_flag + statementLine['globalisation_amount'] = statementLine['amount'] + del statementLine['amount'] + + # The 'globalisation' concept can also be implemented without the globalisation level flag. + # This is e.g. used by Europabank to give the details of Card Payments. + if statementLine['ref_move'] == main_move_stack[-1]['ref_move']: + if statementLine['ref_move_detail'] == '9999': + statement['error'] = True + statement['errors'].append(('R1003', _('\nUnsupported bank account structure !'))) + continue + elif statementLine['ref_move_detail'] != '0000': + if glob_lvl_stack[-1] == 0: + # promote associated move record into a globalisation + glob_lvl_flag = 1 + glob_lvl_stack.append(glob_lvl_flag) + main_st_line_seq = main_move_stack[-1]['sequence'] + to_promote = statement['lines'][main_st_line_seq] + if not main_move_stack[-1].get('detail_cnt'): + to_promote.update({ + 'type': 'globalisation', + 'glob_lvl_flag': glob_lvl_flag, + 'globalisation_amount': main_move_stack[-1]['amount'], + 'amount': False, + 'account_id': 0, + }) + main_move_stack[-1]['promoted'] = True + if not main_move_stack[-1].get('detail_cnt'): + main_move_stack[-1]['detail_cnt'] = 1 + else: + main_move_stack[-1]['detail_cnt'] += 1 + + statement['lines'].append(statementLine) + + if statementLine['ref_move'] != main_move_stack[-1]['ref_move']: + if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): + # add closing globalisation level on previous detail record in order to correctly close + # moves that have been 'promoted' to globalisation + closeglobalise = statement['lines'][len(statement['lines']) - 1] + closeglobalise.update({ + 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], + }) + else: + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + # the same logic is repeated on the New Balance Record ('8 Record') in order to cope with CODA files + # containing a single 2.1 record that needs to be 'demoted'. + if main_move_stack[-1]['type'] == 'globalisation' and not main_move_stack[-1].get('detail_cnt'): + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + main_st_line_seq = main_move_stack[-1]['sequence'] + to_demote = statement['lines'][main_st_line_seq] + to_demote.update({ + 'type': 'general', + 'glob_lvl_flag': 0, + 'globalisation_amount': False, + 'amount': main_move_stack[-1]['globalisation_amount'], + }) + main_move_stack.pop() + main_move_stack.append(statementLine) + elif line[1] == '2': + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + statement['error'] = True + statement['errors'].append(('R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) + continue + statement['lines'][-1]['communication'] += rmspaces(line[10:63]) + statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) + statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) + elif line[1] == '3': + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + statement['error'] = True + statement['errors'].append(('R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) + continue + if statement['version'] == '1': + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) + statement['lines'][-1]['counterpartyCurrency'] = '' + else: + if line[22] == ' ': + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[23:26]) + else: + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:44]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[44:47]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:82]) + statement['lines'][-1]['communication'] += rmspaces(line[82:125]) + else: + # movement data record 2.x (x != 1,2,3) + statement['error'] = True + statement['errors'].append(('R2009', _('\nMovement data records of type 2.%s are not supported !') % line[1])) + elif line[0] == '3': + if line[1] == '1': + infoLine = {} + infoLine['entryDate'] = statement['lines'][-1]['entryDate'] + infoLine['type'] = 'information' + infoLine['sequence'] = len(statement['lines']) + 1 + infoLine['ref'] = rmspaces(line[2:10]) + infoLine['transactionRef'] = rmspaces(line[10:31]) + infoLine['transactionType'] = line[31] + infoLine['transactionFamily'] = rmspaces(line[32:34]) + infoLine['transactionCode'] = rmspaces(line[34:36]) + infoLine['transactioncategory'] = rmspaces(line[36:39]) + infoLine['communication'] = rmspaces(line[40:113]) + statement['lines'].append(infoLine) + elif line[1] == '2': + if statement['lines'][-1]['ref'] != rmspaces(line[2:10]): + statement['error'] = True + statement['errors'].append(('R3004', _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) + continue + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) + elif line[1] == '3': + if statement['lines'][-1]['ref'] != rmspaces(line[2:10]): + statement['error'] = True + statement['errors'].append(('R3005', _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) + continue + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) + elif line[0] == '4': + comm_line = {} + comm_line['type'] = 'communication' + comm_line['sequence'] = len(statement['lines']) + 1 + comm_line['ref'] = rmspaces(line[2:10]) + comm_line['communication'] = rmspaces(line[32:112]) + statement['lines'].append(comm_line) + elif line[0] == '8': + # new balance record + last_transaction = main_move_stack[-1] + if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): + # demote record with globalisation code from 'globalisation' to 'general' when no detail records + main_st_line_seq = main_move_stack[-1]['sequence'] + to_demote = statement['lines'][main_st_line_seq] + to_demote.update({ + 'type': 'general', + 'glob_lvl_flag': 0, + 'globalisation_amount': False, + 'amount': main_move_stack[-1]['globalisation_amount'], + }) + # add closing globalisation level on previous detail record in order to correctly close + # moves that have been 'promoted' to globalisation + if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): + closeglobalise = statement['lines'][-1] + closeglobalise.update({ + 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], + }) + statement['debit'] = line[41] + statement['paperSeqNumber'] = rmspaces(line[1:4]) + statement['balance_end_real'] = float(rmspaces(line[42:57])) / 1000 + statement['balance_end_realDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[57:63]), '%d%m%y')) + if statement['debit'] == '1': # 1=Debit + statement['balance_end_real'] = - statement['balance_end_real'] + if statement['balance_end_realDate']: + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])]) + else: + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) + if not period_id and len(period_id) == 0: + statement['error'] = True + statement['errors'].append(('R0002', _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate'])) + continue + statement['period_id'] = period_id[0] + elif line[0] == '9': + statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 + statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 + if not statement['balance_end_real']: + statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] + for i, statement in enumerate(statements): + print '---STATEMENT #' + str(i) + '---' + print statement + if not statement['error']: + data = { + 'name': '[' + statement['date'] + ']' + statement['description'], + 'date': statement['date'], + 'journal_id': 18, + 'period_id': statement['period_id'], + 'balance_start': statement['balance_start'], + 'balance_end_real': statement['balance_end_real'], + 'account_id': 1 + } + self.pool.get('account.bank.statement').create(cr, uid, data, context=context) + +account_coda_import() + + +def rmspaces(s): + return " ".join(s.split()) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 652f81427e71ba307211ef951ad4913fcd5c6842 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Wed, 5 Dec 2012 18:06:50 +0100 Subject: [PATCH 07/32] [IMP]Parser algorithm improvement bzr revid: dle@openerp.com-20121205170650-a6ydpo9qa14d2c55 --- addons/account/account_bank_statement.py | 2 +- addons/account/account_view.xml | 2 +- .../wizard/account_coda_import.py | 3 +- .../wizard/account_coda_import_dle.py | 903 +++++++++++++----- 4 files changed, 659 insertions(+), 251 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 60f2b230c05..db6795a70c8 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -546,7 +546,7 @@ class account_bank_statement_line(osv.osv): _name = "account.bank.statement.line" _description = "Bank Statement Line" _columns = { - 'name': fields.char('Communication', size=256, required=True), + 'name': fields.char('Communication',size=64, required=True), 'date': fields.date('Date', required=True), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'type': fields.selection([ diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e2c45af8cba..562c1ad6fa1 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -575,7 +575,7 @@ - + diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index fdd56204f77..bb165cf1656 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -973,8 +973,7 @@ class account_coda_import(osv.osv_memory): # handling non-transactional records : line['type'] in ['information', 'communication'] if line['type'] == 'information': - if line['ref_move_detail'] == '0000': - glob_id_stack = [(0, '', 0, '')] # initialise stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) + #Check if this line can be deleted. glob_id_stack marked as undefined here line['globalisation_id'] = glob_id_stack[-1][2] diff --git a/addons/l10n_be_coda/wizard/account_coda_import_dle.py b/addons/l10n_be_coda/wizard/account_coda_import_dle.py index be8bb147698..432008fa58e 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import_dle.py +++ b/addons/l10n_be_coda/wizard/account_coda_import_dle.py @@ -45,6 +45,7 @@ class account_coda_import(osv.osv_memory): if context is None: context = {} if batch: + print codafile = str(codafile) codafilename = codafilename else: @@ -59,273 +60,681 @@ class account_coda_import(osv.osv_memory): statements = [] for line in recordlist: if not line: - continue + pass elif line[0] == '0': #Begin of a new Bank statement statement = {} statements.append(statement) - statement['error'] = False - statement['errors'] = [] statement['version'] = line[127] if statement['version'] not in ['1', '2']: - statement['error'] = True - statement['errors'].append(('R0001', _('CODA V%s statements are not supported, please contact your bank!') % statement['version'])) - continue + raise osv.except_osv(_('Error R001!'), _('CODA V%s statements are not supported, please contact your bank!') % statement['version']) + statement['globalisation_stack'] = [] statement['lines'] = [] statement['date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[5:11]), '%d%m%y')) statement['separateApplication'] = rmspaces(line[83:88]) - elif not statement['error']: - if line[0] == '1': - #Statement details - if statement['version'] == '1': + elif line[0] == '1': + #Statement details + if statement['version'] == '1': + statement['accountNumber'] = rmspaces(line[5:17]) + statement['currency'] = rmspaces(line[18:21]) + elif statement['version'] == '2': + if line[1] == '0': # Belgian bank account BBAN structure statement['accountNumber'] = rmspaces(line[5:17]) statement['currency'] = rmspaces(line[18:21]) - elif statement['version'] == '2': - if line[1] == '0': # Belgian bank account BBAN structure - statement['accountNumber'] = rmspaces(line[5:17]) - statement['currency'] = rmspaces(line[18:21]) - elif line[1] == '1': # foreign bank account BBAN structure - statement['error'] = True - statement['errors'].append(('R1001', _('Foreign bank accounts with BBAN structure are not supported !'))) - continue - elif line[1] == '2': # Belgian bank account IBAN structure - statement['accountNumber'] = rmspaces(line[5:21]) - statement['currency'] = rmspaces(line[39:42]) - elif line[1] == '3': # foreign bank account IBAN structure - statement['error'] = True - statement['errors'].append(('R1002', _('Foreign bank accounts with IBAN structure are not supported !'))) - continue - else: # Something else, not supported - statement['error'] = True - statement['errors'].append(('R1003', _('\nUnsupported bank account structure !'))) - continue - statement['description'] = rmspaces(line[90:125]) - statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 - statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) - statement['accountHolder'] = rmspaces(line[64:90]) - statement['paperSeqNumber'] = rmspaces(line[2:5]) - statement['codaSeqNumber'] = rmspaces(line[125:128]) - elif line[0] == '2': - if line[1] == '1': - #New statement line - statementLine = {} - statementLine['type'] = 'general' - statementLine['ref'] = rmspaces(line[2:10]) - statementLine['ref_move'] = rmspaces(line[2:6]) - statementLine['ref_move_detail'] = rmspaces(line[6:10]) - statementLine['sequence'] = len(statement['lines']) + 1 - if statementLine['sequence'] == 1: - main_move_stack = [statementLine] - glob_lvl_stack = [0] # initialise globalisation stack - elif statementLine['ref_move_detail'] == '0000': - glob_lvl_stack = [0] # re-initialise globalisation stack - statementLine['transactionRef'] = rmspaces(line[10:31]) - statementLine['debit'] = line[31] # 0 = Credit, 1 = Debit - statementLine['amount'] = float(rmspaces(line[32:47])) / 1000 - if statementLine['debit'] == '1': - statementLine['amount'] = - statementLine['amount'] - statementLine['transactionType'] = line[53] - #TODO Handling severals transactions types - statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) - statementLine['transactionFamily'] = rmspaces(line[54:56]) - #TODO Handling severals transactions Family - statementLine['transactionCode'] = rmspaces(line[56:58]) - #TODO Handling severals transactions code - statementLine['transactionCategory'] = rmspaces(line[58:61]) - #TODO Handling severals transactions category - statementLine['communication'] = rmspaces(line[65:115]) - #TODO Handling structured communication - statementLine['entryDate'] = rmspaces(line[115:121]) - - glob_lvl_flag = int(line[124]) - if glob_lvl_flag > 0: - if glob_lvl_stack[-1] == glob_lvl_flag: - statementLine['glob_lvl_flag'] = glob_lvl_flag - statementLine['amount'] = statementLine['amount'] - glob_lvl_stack.pop() - else: - glob_lvl_stack.append(glob_lvl_flag) - statementLine['type'] = 'globalisation' - statementLine['glob_lvl_flag'] = glob_lvl_flag - statementLine['globalisation_amount'] = statementLine['amount'] - del statementLine['amount'] - - # The 'globalisation' concept can also be implemented without the globalisation level flag. - # This is e.g. used by Europabank to give the details of Card Payments. - if statementLine['ref_move'] == main_move_stack[-1]['ref_move']: - if statementLine['ref_move_detail'] == '9999': - statement['error'] = True - statement['errors'].append(('R1003', _('\nUnsupported bank account structure !'))) - continue - elif statementLine['ref_move_detail'] != '0000': - if glob_lvl_stack[-1] == 0: - # promote associated move record into a globalisation - glob_lvl_flag = 1 - glob_lvl_stack.append(glob_lvl_flag) - main_st_line_seq = main_move_stack[-1]['sequence'] - to_promote = statement['lines'][main_st_line_seq] - if not main_move_stack[-1].get('detail_cnt'): - to_promote.update({ - 'type': 'globalisation', - 'glob_lvl_flag': glob_lvl_flag, - 'globalisation_amount': main_move_stack[-1]['amount'], - 'amount': False, - 'account_id': 0, - }) - main_move_stack[-1]['promoted'] = True - if not main_move_stack[-1].get('detail_cnt'): - main_move_stack[-1]['detail_cnt'] = 1 - else: - main_move_stack[-1]['detail_cnt'] += 1 - - statement['lines'].append(statementLine) - - if statementLine['ref_move'] != main_move_stack[-1]['ref_move']: - if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): - # add closing globalisation level on previous detail record in order to correctly close - # moves that have been 'promoted' to globalisation - closeglobalise = statement['lines'][len(statement['lines']) - 1] - closeglobalise.update({ - 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], - }) - else: - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - # the same logic is repeated on the New Balance Record ('8 Record') in order to cope with CODA files - # containing a single 2.1 record that needs to be 'demoted'. - if main_move_stack[-1]['type'] == 'globalisation' and not main_move_stack[-1].get('detail_cnt'): - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - main_st_line_seq = main_move_stack[-1]['sequence'] - to_demote = statement['lines'][main_st_line_seq] - to_demote.update({ - 'type': 'general', - 'glob_lvl_flag': 0, - 'globalisation_amount': False, - 'amount': main_move_stack[-1]['globalisation_amount'], - }) - main_move_stack.pop() - main_move_stack.append(statementLine) - elif line[1] == '2': - if statement['lines'][-1]['ref'][0:4] != line[2:6]: - statement['error'] = True - statement['errors'].append(('R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) - continue - statement['lines'][-1]['communication'] += rmspaces(line[10:63]) - statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) - statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) - elif line[1] == '3': - if statement['lines'][-1]['ref'][0:4] != line[2:6]: - statement['error'] = True - statement['errors'].append(('R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) - continue - if statement['version'] == '1': - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) - statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) - statement['lines'][-1]['counterpartyCurrency'] = '' + elif line[1] == '1': # foreign bank account BBAN structure + raise osv.except_osv(_('Error R1001!'), _('Foreign bank accounts with BBAN structure are not supported !')) + elif line[1] == '2': # Belgian bank account IBAN structure + statement['accountNumber'] = rmspaces(line[5:21]) + statement['currency'] = rmspaces(line[39:42]) + elif line[1] == '3': # foreign bank account IBAN structure + raise osv.except_osv(_('Error R1002!'), _('Foreign bank accounts with IBAN structure are not supported !')) + else: # Something else, not supported + raise osv.except_osv(_('Error R1003!'), _('\nUnsupported bank account structure !')) + statement['description'] = rmspaces(line[90:125]) + statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 + statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) + statement['accountHolder'] = rmspaces(line[64:90]) + statement['paperSeqNumber'] = rmspaces(line[2:5]) + statement['codaSeqNumber'] = rmspaces(line[125:128]) + elif line[0] == '2': + if line[1] == '1': + #New statement line + statementLine = {} + statementLine['type'] = 'general' + statementLine['ref'] = rmspaces(line[2:10]) + statementLine['ref_move'] = rmspaces(line[2:6]) + statementLine['ref_move_detail'] = rmspaces(line[6:10]) + statementLine['sequence'] = len(statement['lines']) + 1 + statementLine['transactionRef'] = rmspaces(line[10:31]) + statementLine['debit'] = line[31] # 0 = Credit, 1 = Debit + statementLine['amount'] = float(rmspaces(line[32:47])) / 1000 + if statementLine['debit'] == '1': + statementLine['amount'] = - statementLine['amount'] + statementLine['transaction_type'] = line[53] + if statementLine['transaction_type'] not in transaction_types: + raise osv.except_osv(_('Error R2001!'), _('The File contains an invalid CODA Transaction Type : %s!') % statementLine['transaction_type']) + statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) + statementLine['transaction_family'] = rmspaces(line[54:56]) + #TODO Handling severals transactions Family + statementLine['transaction_code'] = rmspaces(line[56:58]) + #TODO Handling severals transactions code + statementLine['transaction_category'] = rmspaces(line[58:61]) + #TODO Handling severals transactions category + statementLine['communication'] = rmspaces(line[62:115]) + #TODO Handling structured communication + statementLine['entryDate'] = rmspaces(line[115:121]) + statementLine['type'] = 'normal' + statementLine['globalisation'] = int(line[124]) + if len(statement['globalisation_stack']) > 0: + statementLine['communication'] = "\n".join([statement['globalisation_stack'][-1]['communication'], statementLine['communication']]) + if statementLine['globalisation'] > 0: + if len(statement['globalisation_stack']) > 0 and statement['globalisation_stack'][-1]['globalisation'] == statementLine['globalisation']: + # Destack + statement['globalisation_stack'].pop() else: - if line[22] == ' ': - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) - statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[23:26]) - else: - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:44]) - statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[44:47]) - statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:82]) - statement['lines'][-1]['communication'] += rmspaces(line[82:125]) + #Stack + statementLine['type'] = 'globalisation' + statement['globalisation_stack'].append(statementLine) + statement['lines'].append(statementLine) + elif line[1] == '2': + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + raise osv.except_osv(_('Error R2004!'), _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:63]) + statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) + statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) + elif line[1] == '3': + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + raise osv.except_osv(_('Error R2005!'), _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + if statement['version'] == '1': + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) + statement['lines'][-1]['counterpartyCurrency'] = '' else: - # movement data record 2.x (x != 1,2,3) - statement['error'] = True - statement['errors'].append(('R2009', _('\nMovement data records of type 2.%s are not supported !') % line[1])) - elif line[0] == '3': - if line[1] == '1': - infoLine = {} - infoLine['entryDate'] = statement['lines'][-1]['entryDate'] - infoLine['type'] = 'information' - infoLine['sequence'] = len(statement['lines']) + 1 - infoLine['ref'] = rmspaces(line[2:10]) - infoLine['transactionRef'] = rmspaces(line[10:31]) - infoLine['transactionType'] = line[31] - infoLine['transactionFamily'] = rmspaces(line[32:34]) - infoLine['transactionCode'] = rmspaces(line[34:36]) - infoLine['transactioncategory'] = rmspaces(line[36:39]) - infoLine['communication'] = rmspaces(line[40:113]) - statement['lines'].append(infoLine) - elif line[1] == '2': - if statement['lines'][-1]['ref'] != rmspaces(line[2:10]): - statement['error'] = True - statement['errors'].append(('R3004', _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) - continue - statement['lines'][-1]['communication'] += rmspaces(line[10:100]) - elif line[1] == '3': - if statement['lines'][-1]['ref'] != rmspaces(line[2:10]): - statement['error'] = True - statement['errors'].append(('R3005', _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10])) - continue - statement['lines'][-1]['communication'] += rmspaces(line[10:100]) - elif line[0] == '4': - comm_line = {} - comm_line['type'] = 'communication' - comm_line['sequence'] = len(statement['lines']) + 1 - comm_line['ref'] = rmspaces(line[2:10]) - comm_line['communication'] = rmspaces(line[32:112]) - statement['lines'].append(comm_line) - elif line[0] == '8': - # new balance record - last_transaction = main_move_stack[-1] - if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - main_st_line_seq = main_move_stack[-1]['sequence'] - to_demote = statement['lines'][main_st_line_seq] - to_demote.update({ - 'type': 'general', - 'glob_lvl_flag': 0, - 'globalisation_amount': False, - 'amount': main_move_stack[-1]['globalisation_amount'], - }) - # add closing globalisation level on previous detail record in order to correctly close - # moves that have been 'promoted' to globalisation - if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): - closeglobalise = statement['lines'][-1] - closeglobalise.update({ - 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], - }) - statement['debit'] = line[41] - statement['paperSeqNumber'] = rmspaces(line[1:4]) - statement['balance_end_real'] = float(rmspaces(line[42:57])) / 1000 - statement['balance_end_realDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[57:63]), '%d%m%y')) - if statement['debit'] == '1': # 1=Debit - statement['balance_end_real'] = - statement['balance_end_real'] - if statement['balance_end_realDate']: - period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])]) - else: - period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) - if not period_id and len(period_id) == 0: - statement['error'] = True - statement['errors'].append(('R0002', _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate'])) - continue - statement['period_id'] = period_id[0] - elif line[0] == '9': - statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 - statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 - if not statement['balance_end_real']: - statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] + if line[22] == ' ': + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[23:26]) + else: + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:44]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[44:47]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:82]) + statement['lines'][-1]['communication'] += rmspaces(line[82:125]) + else: + # movement data record 2.x (x != 1,2,3) + raise osv.except_osv(_('Error R2009!'), _('\nMovement data records of type 2.%s are not supported !') % line[1]) + elif line[0] == '3': + if line[1] == '1': + infoLine = {} + infoLine['entryDate'] = statement['lines'][-1]['entryDate'] + infoLine['type'] = 'information' + infoLine['sequence'] = len(statement['lines']) + 1 + infoLine['ref'] = rmspaces(line[2:10]) + infoLine['transactionRef'] = rmspaces(line[10:31]) + infoLine['transaction_type'] = line[31] + infoLine['transaction_family'] = rmspaces(line[32:34]) + infoLine['transaction_code'] = rmspaces(line[34:36]) + infoLine['transaction_category'] = rmspaces(line[36:39]) + infoLine['communication'] = rmspaces(line[40:113]) + infoLine['amount'] = 0.0 + infoLine['type'] = 'information' + statement['lines'].append(infoLine) + elif line[1] == '2': + if infoLine['ref'] != rmspaces(line[2:10]): + raise osv.except_osv(_('Error R3004!'), _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) + elif line[1] == '3': + if infoLine['ref'] != rmspaces(line[2:10]): + raise osv.except_osv(_('Error R3005!'), _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) + elif line[0] == '4': + comm_line = {} + comm_line['type'] = 'communication' + comm_line['sequence'] = len(statement['lines']) + 1 + comm_line['ref'] = rmspaces(line[2:10]) + comm_line['communication'] = rmspaces(line[32:112]) + comm_line['amount'] = 0.0 + comm_line['type'] = 'communication' + statement['lines'].append(comm_line) + elif line[0] == '8': + # new balance record + statement['debit'] = line[41] + statement['paperSeqNumber'] = rmspaces(line[1:4]) + statement['balance_end_real'] = float(rmspaces(line[42:57])) / 1000 + statement['balance_end_realDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[57:63]), '%d%m%y')) + if statement['debit'] == '1': # 1=Debit + statement['balance_end_real'] = - statement['balance_end_real'] + if statement['balance_end_realDate']: + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])]) + else: + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) + if not period_id and len(period_id) == 0: + raise osv.except_osv(_('Error R0002!'), _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate']) + statement['period_id'] = period_id[0] + elif line[0] == '9': + statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 + statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 + if not statement['balance_end_real']: + statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): - print '---STATEMENT #' + str(i) + '---' + # print '---STATEMENT #' + str(i) + '---' print statement - if not statement['error']: - data = { - 'name': '[' + statement['date'] + ']' + statement['description'], - 'date': statement['date'], - 'journal_id': 18, - 'period_id': statement['period_id'], - 'balance_start': statement['balance_start'], - 'balance_end_real': statement['balance_end_real'], - 'account_id': 1 - } - self.pool.get('account.bank.statement').create(cr, uid, data, context=context) + data = { + 'name': '[' + statement['date'] + ']' + statement['description'], + 'date': statement['date'], + 'journal_id': 18, + 'period_id': statement['period_id'], + 'balance_start': statement['balance_start'], + 'balance_end_real': statement['balance_end_real'], + 'account_id': 1 + } + statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) + for line in statement['lines']: + if line['type'] == 'normal': + counterparty = [] + if 'counterpartyName' in line: + counterparty.append(line['counterpartyName']) + if 'counterpartyNumber' in line: + counterparty.append(line['counterpartyNumber']) + if len(counterparty) > 0: + counterparty = '[' + ' / '.join(counterparty) + ']' + else: + counterparty = '/' + if line['transaction_type'] in transaction_types: + line['transaction_type'] = transaction_types[line['transaction_type']][1] + if line['transaction_category'] in transaction_categories: + line['transaction_category'] = transaction_categories[line['transaction_category']] + if line['transaction_family'] in transaction_codes: + transaction_family = transaction_codes[line['transaction_family']] + line['transaction_family'] = transaction_family[0] + if line['transaction_code'] in transaction_family[1]: + line['transaction_code'] = transaction_family[1][line['transaction_code']] + note = [] + note.append(_('Counter Party') + ': ' + counterparty) + note.append(_('Communication') + ': ' + line['communication']) + note.append(_('Transaction type') + ': ' + line['transaction_type']) + note.append(_('Transaction family') + ': ' + line['transaction_family']) + note.append(_('Transaction code') + ': ' + line['transaction_code']) + note.append(_('Transaction category') + ': ' + line['transaction_category']) + + try: + if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: + line['counterpartyNumber'] = False + except: + pass + if 'counterpartyNumber' in line and line['counterpartyNumber']: + ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) + if ids and len(ids) > 0: + partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0],context=context).partner_id.id + else: + partner_id = None + + data = { + 'name': line['communication'], + 'note': "\n".join(note), + 'date': line['entryDate'], + 'amount': line['amount'], + # 'type': '', + 'partner_id': partner_id, + 'account_id': 1, + 'statement_id': statement['id'], + # 'analytic_account_id': '', + # 'move_ids': '', + 'ref': line['ref'], + 'sequence': line['sequence'], + } + self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) account_coda_import() +transaction_types = { + "0": ["", _("Simple amount without detailed data; e.g. : an individual credit transfer [free of charges].")], + "1": ["", _("Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is ]debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following [type 5].")], + "5": ["1", _("Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record [type 1].")], + "2": ["", _("Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data [type 6 or 7] is following.")], + "6": ["2", _("Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6.")], + "7": ["2", _("Detail of 2. Simple account with detailed data The records in a separate application keep type 7.")], + "9": ["7", _("Detail of 7. The records in a separate application keep type 9.")], + "3": ["", _("Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers.")], + "8": ["3", _("Detail of 3.")], +} + +transaction_codes = { + "00": [_("Undefined transactions"), { + "89": _("Cancellation of a transaction"), + "87": _("Costs refunded"), + "85": _("Correction"), + "83": _("Value correction"), + "39": _("Cancellation of a transaction"), + "37": _("Costs"), + "35": _("Correction"), + "33": _("Value correction"), + "00": _("Undefined transaction") + }], + "01": [_("Domestic or local SEPA credit transfers"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "66": _("Financial centralization"), + "64": _("Transfer to your account"), + "62": _("Unpaid postal order"), + "60": _("Non-presented circular cheque"), + "54": _("Unexecutable transfer order"), + "52": _("Payment in your favour"), + "51": _("Transfer in your favour – initiated by the bank"), + "50": _("Transfer in your favour"), + "49": _("Cancellation or correction"), + "39": _("Your issue circular cheque"), + "37": _("Costs"), + "17": _("Financial centralisation"), + "15": _("Balance due insurance premium"), + "13": _("Transfer from your account"), + "11": _("Your semi-standing order – payment to employees"), + "09": _("Your semi-standing order"), + "07": _("Collective transfer"), + "05": _("Payment of wages etc."), + "03": _("Standing order"), + "02": _("Individual transfer order initiated by the bank"), + "01": _("Individual transfer order]"), + }], + "03": [_("Cheques"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of cheque-related costs"), + "68": _("Credit of a payment via electronic purse"), + "66": _("Remittance of cheque by your branch - credit under usual reserve"), + "64": _("Reversal of settlement of credit card"), + "63": _("Second credit of unpaid cheque"), + "62": _("Reversal of cheque"), + "60": _("Reversal of voucher"), + "58": _("Remittance of cheques, vouchers, etc. credit after collection"), + "56": _("Non-presented certified cheques"), + "52": _("First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve"), + "50": _("Credit of a payment via terminal"), + "49": _("Cancellation or correction"), + "39": _("Provisionally unpaid due to other reason than manual presentation"), + "38": _("Provisionally unpaid"), + "37": _("Cheque-related costs"), + "35": _("Cash advance"), + "19": _("Settlement of credit cards"), + "17": _("Your certified cheque"), + "15": _("Your purchase bank cheque"), + "13": _("Eurocheque written out abroad"), + "11": _("Department store cheque"), + "09": _("Unpaid voucher"), + "07": _("Definitely unpaid cheque"), + "05": _("Payment of voucher"), + "03": _("Your purchase by payment card"), + "01": _("Payment of your cheque"), + }], + "04": [_("Cards"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "68": _("Credit after Proton payments"), + "55": _("Income from payments by GSM"), + "53": _("Cash deposit at an ATM"), + "52": _("Loading GSM cards"), + "51": _("Unloading Proton"), + "50": _("Credit after a payment at a terminal"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "08": _("Payment by means of a payment card outside the Eurozone"), + "07": _("Payment by GSM"), + "06": _("Payment with tank card"), + "05": _("Loading Proton"), + "04": _("Cash withdrawal from an ATM"), + "03": _("Settlement credit cards"), + "02": _("Payment by means of a payment card within the Eurozone"), + "01": _("Loading a GSM card"), + }], + "05": [_("Direct debit"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "58": _("Reversal"), + "56": _("Unexecutable reimbursement"), + "54": _("Reimbursement"), + "52": _("Credit under usual reserve"), + "50": _("Credit after collection"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "05": _("Reimbursement"), + "03": _("Unpaid debt"), + "01": _("Payment"), + }], + "07": [_("Domestic commercial paper"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "86": _("Payment after cession"), + "64": _("Warrant"), + "58": _("Remittance of supplier's bill without guarantee"), + "56": _("Remittance of supplier's bill with guarantee"), + "54": _("Remittance of commercial paper for discount"), + "52": _("Remittance of commercial paper - credit under usual reserve"), + "50": _("Remittance of commercial paper - credit after collection"), + "49": _("Cancellation or correction"), + "39": _("Return of an irregular bill of exchange"), + "37": _("Costs related to commercial paper"), + "14": _("Warrant fallen due"), + "12": _("Safe custody"), + "10": _("Renewal of agreed maturity date"), + "09": _("Agio on supplier's bill"), + "08": _("Payment in advance"), + "07": _("Unpaid commercial paper"), + "06": _("Extension of maturity date"), + "05": _("Commercial paper claimed back"), + "03": _("Payment receipt card"), + "01": _("Payment commercial paper"), + }], + "09": [_("Counter transactions"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Sale of traveller’s cheque"), + "68": _("Difference in payment"), + "66": _("Repurchase of petrol coupons"), + "64": _("Your winning lottery ticket"), + "62": _("Sale of gold/pieces under usual reserve"), + "60": _("Sale of foreign bank notes"), + "58": _("Payment by your branch/agents"), + "56": _("Reserve"), + "54": _("Your payment ATM"), + "52": _("Payment night safe"), + "50": _("Cash payment"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "25": _("Purchase of traveller’s cheque"), + "21": _("Cash withdrawal on card (PROTON)"), + "19": _("Difference in payment"), + "17": _("Purchase of fiscal stamps"), + "15": _("Your purchase of lottery tickets"), + "13": _("Cash withdrawal by your branch or agents"), + "11": _("Your purchase of luncheon vouchers"), + "09": _("Purchase of petrol coupons"), + "07": _("Purchase of gold/pieces"), + "05": _("Purchase of foreign bank notes"), + "03": _("Cash withdrawal by card (ATM)"), + "01": _("Cash withdrawal"), + }], + "11": [_("Securities"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Settlement of securities"), + "68": _("Compensation for missing coupon"), + "66": _("Retrocession of issue commission"), + "64": _("Your issue"), + "62": _("Interim interest on subscription"), + "58": _("Repayable securities from a deposit or delivered at the counter - credit under usual reserve"), + "56": _("Reserve"), + "52": _("Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve"), + "51": _("Tender"), + "50": _("Sale of securities"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "19": _("Regularisation costs"), + "17": _("Management fee"), + "15": _("Interim interest on subscription"), + "13": _("Your repurchase of issue"), + "11": _("Payable coupons/repayable securities"), + "09": _("Settlement of securities"), + "06": _("Share option plan – exercising an option"), + "05": _("Partial payment subscription"), + "04": _("Issues"), + "03": _("Subscription to securities"), + "02": _("Tenders"), + "01": _("Purchase of securities"), + }], + "13": [_("Credit"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Settlement of discount bank acceptance"), + "68": _("Documentary export credits"), + "62": _("Term loan"), + "60": _("Settlement of mortgage loan"), + "56": _("Subsidy"), + "55": _("Fixed advance – interest only"), + "54": _("Fixed advance – capital and interest"), + "50": _("Settlement of instalment credit"), + "49": _("Cancellation or correction"), + "37": _("Credit-related costs"), + "21": _("Other credit applications"), + "19": _("Documentary import credits"), + "15": _("Your repayment hire-purchase and similar claims"), + "13": _("Settlement of bank acceptances"), + "11": _("Your repayment mortgage loan"), + "07": _("Your repayment instalment credits"), + "05": _("Settlement of fixed advance"), + "02": _("Long-term loan"), + "01": _("Short-term loan"), + }], + "30": [_("Various transactions"), { + "99": _("Cancellation or correction"), + "89": _("Undefined transaction"), + "87": _("Reimbursement of costs"), + "83": _("Value (date) correction"), + "55": _("Interest term investment"), + "54": _("Capital and/or interest term investment"), + "52": _("Forward sale of foreign exchange"), + "50": _("Spot sale of foreign exchange"), + "49": _("Cancellation or correction"), + "39": _("Undefined transaction"), + "37": _("Costs"), + "33": _("Value (date) correction"), + "05": _("Capital and/or interest term investment"), + "03": _("Forward purchase of foreign exchange"), + "01": _("Spot purchase of foreign exchange"), + }], + "35": [_("Closing (periodical settlements for interest, costs,…)"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "50": _("Closing"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "01": _("Closing"), + }], + "41": [_("International credit transfers - non-SEPA credit transfers"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "66": _("Financial centralisation (credit)"), + "64": _("Transfer to your account"), + "50": _("Transfer"), + "49": _("Cancellation or correction"), + "38": _("Costs relating to incoming foreign and non-SEPA transfers"), + "37": _("Costs relating to outgoing foreign transfers and non-SEPA transfers"), + "17": _("Financial centralisation (debit)"), + "13": _("Transfer from your account"), + "07": _("Collective transfers"), + "05": _("Collective payments of wages"), + "03": _("Standing order"), + "01": _("Transfer"), + }], + "43": [_("Foreign cheques"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Purchase of traveller’s cheque"), + "62": _("Reversal of cheques"), + "58": _("Remittance of foreign cheque credit after collection"), + "52": _("Remittance of foreign cheque credit under usual reserve"), + "49": _("Cancellation or correction"), + "37": _("Costs relating to payment of foreign cheques"), + "15": _("Purchase of an international bank cheque"), + "07": _("Unpaid foreign cheque"), + "01": _("Payment of a foreign cheque"), + }], + "47": [_("Foreign commercial paper"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "64": _("Warrant"), + "62": _("Remittance of documents abroad - credit after collection"), + "60": _("Remittance of documents abroad - credit under usual reserve"), + "58": _("Idem without guarantee"), + "56": _("Remittance of guaranteed foreign supplier's bill"), + "54": _("Discount abroad"), + "52": _("Remittance of foreign bill credit under usual reserve"), + "50": _("Remittance of foreign bill credit after collection"), + "49": _("Cancellation or correction"), + "37": _("Costs relating to the payment of a foreign bill"), + "14": _("Warrant fallen due"), + "13": _("Discount foreign supplier's bills"), + "11": _("Payment documents abroad"), + "07": _("Unpaid foreign bill"), + "06": _("Extension"), + "05": _("Bill claimed back"), + "01": _("Payment of foreign bill"), + }], + "49": [_("Foreign counter transactions"), {"03": _("ATM withdrawal")}], + "80": [_("Separately charged costs and provisions"), { + "01": _("Guarantee card charges"), + "02": _("Costs relating to electronic output"), + "03": _("Payment card charges"), + "04": _("Costs for holding a documentary cash credit"), + "05": _("Card charges"), + "06": _("Damage relating to bills and cheques"), + "07": _("Insurance costs"), + "08": _("Registering compensation for savings accounts"), + "09": _("Postage"), + "10": _("Purchase of Smartcard"), + "11": _("Costs for the safe custody of correspondence"), + "12": _("Costs for opening a bank guarantee"), + "13": _("Renting of safes"), + "14": _("Handling costs instalment credit"), + "15": _("Night safe"), + "16": _("Bank confirmation to revisor or accountant"), + "17": _("Charge for safe custody"), + "18": _("Trade information"), + "19": _("Special charge for safe custody"), + "20": _("Drawing up a certificate"), + "21": _("Pay-packet charges"), + "22": _("Management/custody"), + "23": _("Research costs"), + "24": _("Participation in and management of interest refund system"), + "25": _("Renting of direct debit box"), + "26": _("Travel insurance premium"), + "27": _("Subscription fee"), + "29": _("Information charges"), + "31": _("Writ service fee"), + "33": _("Miscellaneous fees and commissions"), + "35": _("Costs"), + "37": _("Access right to database"), + "39": _("Surety fee"), + "41": _("Research costs"), + "43": _("Printing of forms"), + "45": _("Documentary credit charges"), + "47": _("Charging fees for transactions"), + "49": _("Cancellation or correction"), + "99": _("Cancellation or correction"), + }], +} + +transaction_categories = { + "000": _("Net amount"), + "001": _("Interest received"), + "002": _("Interest paid"), + "003": _("Credit commission"), + "004": _("Postage"), + "005": _("Renting of letterbox"), + "006": _("Various fees/commissions"), + "007": _("Access right to database"), + "008": _("Information charges"), + "009": _("Travelling expenses"), + "010": _("Writ service fee"), + "011": _("VAT"), + "012": _("Exchange commission"), + "013": _("Payment commission"), + "014": _("Collection commission"), + "015": _("Correspondent charges"), + "016": _("BLIW/IBLC dues"), + "017": _("Research costs"), + "018": _("Tental guarantee charges"), + "019": _("Tax on physical delivery"), + "020": _("Costs of physical delivery"), + "021": _("Costs for drawing up a bank cheque"), + "022": _("Priority costs"), + "023": _("Exercising fee"), + "024": _("Growth premium"), + "025": _("Individual entry for exchange charges"), + "026": _("Handling commission"), + "027": _("Charges for unpaid bills"), + "028": _("Fidelity premium"), + "029": _("Protest charges"), + "030": _("Account insurance"), + "031": _("Charges foreign cheque"), + "032": _("Drawing up a circular cheque"), + "033": _("Charges for a foreign bill"), + "034": _("Reinvestment fee"), + "035": _("Charges foreign documentary bill"), + "036": _("Costs relating to a refused cheque"), + "037": _("Commission for handling charges"), + "039": _("Telecommunications"), + "041": _("Credit card costs"), + "042": _("Payment card costs"), + "043": _("Insurance costs"), + "045": _("Handling costs"), + "047": _("Charges extension bill"), + "049": _("Fiscal stamps/stamp duty"), + "050": _("Capital term investment"), + "051": _("Withholding tax"), + "052": _("Residence state tax"), + "053": _("Printing of forms"), + "055": _("Repayment loan or credit capital"), + "057": _("Interest subsidy"), + "058": _("Capital premium"), + "059": _("Default interest"), + "061": _("Charging fees for transactions"), + "063": _("Rounding differences"), + "065": _("Interest payment advice"), + "066": _("Fixed loan advance - reimbursement"), + "067": _("Fixed loan advance - extension"), + "068": _("Countervalue of an entry"), + "069": _("Forward arbitrage contracts : sum to be supplied by customer"), + "070": _("Forward arbitrage contracts : sum to be supplied by bank"), + "071": _("Fixed loan advance - availability"), + "072": _("Countervalue of commission to third party"), + "073": _("Costs of ATM abroad"), + "074": _("Mailing costs"), + "100": _("Gross amount"), + "200": _("Overall documentary credit charges"), + "201": _("Advice notice commission"), + "202": _("Advising commission | Additional advising commission"), + "203": _("Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission"), + "204": _("Amendment fee"), + "205": _("Documentary payment commission | Document commission | Drawdown fee | Negotiation fee"), + "206": _("Surety fee/payment under reserve"), + "207": _("Non-conformity fee"), + "208": _("Commitment fee deferred payment"), + "209": _("Transfer commission"), + "210": _("Commitment fee"), + "211": _("Credit arrangement fee | Additional credit arrangement fee"), + "212": _("Warehousing fee"), + "213": _("Financing fee"), + "214": _("Issue commission (delivery order)"), + "400": _("Acceptance fee"), + "401": _("Visa charges"), + "402": _("Certification costs"), + "403": _("Minimum discount rate"), + "404": _("Discount commission"), + "405": _("Bill guarantee commission"), + "406": _("Collection charges"), + "407": _("Costs Article 45"), + "408": _("Cover commission"), + "409": _("Safe deposit charges"), + "410": _("Reclamation charges"), + "411": _("Fixed collection charge"), + "412": _("Advice of expiry charges"), + "413": _("Acceptance charges"), + "414": _("Regularisation charges"), + "415": _("Surety fee"), + "416": _("Charges for the deposit of security"), + "418": _("Endorsement commission"), + "419": _("Bank service fee"), + "420": _("Retention charges"), + "425": _("Foreign broker's commission"), + "426": _("Belgian broker's commission"), + "427": _("Belgian Stock Exchange tax"), + "428": _("Interest accrued"), + "429": _("Foreign Stock Exchange tax"), + "430": _("Recovery of foreign tax"), + "431": _("Delivery of a copy"), +} + def rmspaces(s): return " ".join(s.split()) + + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 4333defecd2f1b780cc72449084dd2e8de3caf0b Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Wed, 5 Dec 2012 18:38:01 +0100 Subject: [PATCH 08/32] [DEL]All old object and views which are now useless bzr revid: dle@openerp.com-20121205173801-9abvk3u03mxvwp91 --- addons/l10n_be_coda/__init__.py | 1 - addons/l10n_be_coda/__openerp__.py | 6 - addons/l10n_be_coda/l10n_be_coda.py | 499 ---- .../l10n_be_coda/l10n_be_coda_comm_type.xml | 140 - .../l10n_be_coda_trans_category.xml | 440 --- .../l10n_be_coda/l10n_be_coda_trans_code.xml | 1914 ------------- .../l10n_be_coda/l10n_be_coda_trans_type.xml | 49 - addons/l10n_be_coda/l10n_be_coda_view.xml | 549 +--- addons/l10n_be_coda/l10n_be_coda_wizard.xml | 14 - addons/l10n_be_coda/res_bank.py | 34 - addons/l10n_be_coda/res_bank_view.xml | 31 - .../security/account_security.xml | 11 - .../l10n_be_coda/security/ir.model.access.csv | 17 - addons/l10n_be_coda/wizard/__init__.py | 2 +- .../wizard/account_coda_import.py | 2481 +++++------------ .../wizard/account_coda_import_dle.py | 740 ----- 16 files changed, 652 insertions(+), 6276 deletions(-) delete mode 100644 addons/l10n_be_coda/l10n_be_coda.py delete mode 100644 addons/l10n_be_coda/l10n_be_coda_comm_type.xml delete mode 100644 addons/l10n_be_coda/l10n_be_coda_trans_category.xml delete mode 100644 addons/l10n_be_coda/l10n_be_coda_trans_code.xml delete mode 100644 addons/l10n_be_coda/l10n_be_coda_trans_type.xml delete mode 100755 addons/l10n_be_coda/res_bank.py delete mode 100755 addons/l10n_be_coda/res_bank_view.xml delete mode 100644 addons/l10n_be_coda/security/account_security.xml delete mode 100644 addons/l10n_be_coda/security/ir.model.access.csv delete mode 100644 addons/l10n_be_coda/wizard/account_coda_import_dle.py diff --git a/addons/l10n_be_coda/__init__.py b/addons/l10n_be_coda/__init__.py index 4a58b8ad059..c737eb79536 100644 --- a/addons/l10n_be_coda/__init__.py +++ b/addons/l10n_be_coda/__init__.py @@ -20,7 +20,6 @@ # ############################################################################## -import l10n_be_coda import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py index 2c8931f484c..14e1bf6e443 100644 --- a/addons/l10n_be_coda/__openerp__.py +++ b/addons/l10n_be_coda/__openerp__.py @@ -93,12 +93,6 @@ If required, you can manually adjust the descriptions via the CODA configuration 'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], 'demo': [], 'data': [ - 'l10n_be_coda_trans_type.xml', - 'l10n_be_coda_trans_code.xml', - 'l10n_be_coda_trans_category.xml', - 'l10n_be_coda_comm_type.xml', - 'security/ir.model.access.csv', - 'security/account_security.xml', 'l10n_be_coda_wizard.xml', 'l10n_be_coda_view.xml', ], diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py deleted file mode 100644 index cc11c72cf06..00000000000 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ /dev/null @@ -1,499 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# -# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import osv, fields -import decimal_precision as dp -from tools.translate import _ -import logging -_logger = logging.getLogger(__name__) - - -class coda_bank_account(osv.osv): - _name = 'coda.bank.account' - _description = 'CODA Bank Account Configuration' - - def _check_account_pain(self, cr, uid, context=None): - res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_pain'), ('state', '=', 'installed')]) - return res and True or False - - def _check_currency(self, cr, uid, ids, context=None): - obj_cba = self.browse(cr, uid, ids[0], context=context) - if (obj_cba.state == 'normal') and obj_cba.journal: - if obj_cba.journal.currency and (obj_cba.currency != obj_cba.journal.currency): - return False - if not obj_cba.journal.currency and (obj_cba.currency != obj_cba.company_id.currency_id): - return False - return True - - _columns = { - 'name': fields.char('Name', size=64, required=True), - 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True, - help='Bank Account Number.\nThe CODA import function will find its CODA processing parameters on this number.'), - 'description1': fields.char('Primary Account Description', size=35, - help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), - 'description2': fields.char('Secondary Account Description', size=35, - help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'), - 'state': fields.selection([ - ('normal', 'Normal'), - ('info', 'Info')], - 'Type', required=True, select=1, - help='No Bank Statements will be generated for CODA Bank Statements from Bank Accounts of type \'Info\'.'), - 'journal': fields.many2one('account.journal', 'Journal', - domain=[('type', '=', 'bank')], - states={'normal': [('required', True)], 'info': [('required', False)]}, - help='Bank Journal for the Bank Statement'), - 'currency': fields.many2one('res.currency', 'Currency', required=True, - help='The currency of the CODA Bank Statement'), - 'coda_st_naming': fields.char('Bank Statement Naming Policy', size=64, - help="Define the rules to create the name of the Bank Statements generated by the CODA processing." \ - "\nE.g. %(code)s%(y)s/%(paper)s" \ - "\n\nVariables:" \ - "\nBank Journal Code: %(code)s" \ - "\nYear (of CODA 'New Balance Date') with Century: %(year)s" \ - "\nYear (of CODA 'New Balance Date') without Century: %(y)s" \ - "\nCODA sequence number: %(coda)s" \ - "\nPaper Statement sequence number (as specified on 'Old Balance' record): %(paper_ob)s" \ - "\nPaper Statement sequence number (as specified on 'New Balance' record): %(paper)s"), - 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', domain=[('type', '!=', 'view')], required=True, - help='Set here the default account that will be used if the partner cannot be unambiguously identified.'), - 'transfer_account': fields.many2one('account.account', 'Default Internal Transfer Account', domain=[('code', 'like', '58%'), ('type', '!=', 'view')], required=True, - help='Set here the default account that will be used for internal transfer between own bank accounts (e.g. transfer between current and deposit bank accounts).'), - 'account_mapping_ids': fields.one2many('coda.account.mapping.rule', 'coda_bank_account_id', 'Account Mapping Rules'), - 'find_payment': fields.boolean('Lookup Payment Reference', - help='Invoice lookup and reconciliation via the SEPA EndToEndReference.' \ - '\nInstall the \'account_pain\' module if you want to take advantage of this feature.'), - 'find_bbacom': fields.boolean('Lookup Structured Communication of type \'BBA\'', - help='Partner lookup and reconciliation via the \'BBA\' Structured Communication.' \ - '\nA partial reconciliation will be created when there is no exact match between the Invoice and Bank Transaction amounts.'), - 'find_inv_number': fields.boolean('Lookup Invoice Number', - help='Partner lookup and reconciliation via the Invoice Number when a communication in free format is used.' \ - '\nA reconciliation will only be created in case of exact match between the Invoice and Bank Transaction amounts.'), - 'find_partner': fields.boolean('Lookup Partner', - help='Partner lookup via Bank Account Number in order to facilitate the reconciliation.'), - 'update_partner': fields.boolean('Update Partner Bank Accounts', - help='Update Partner record when the Counterparty\'s Bank Account has not been registered yet.'), - 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', - help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), - 'discard_dup': fields.boolean('Discard Duplicates', - help="Duplicate Bank Statements will be discarded. Select the corresponding 'CODA Bank Statement' in order to view the contents of such duplicates."), - 'active': fields.boolean('Active', help='If the active field is set to False, it will allow you to hide the Bank Account without removing it.'), - 'company_id': fields.many2one('res.company', 'Company', required=True), - } - _defaults = { - 'currency': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, - 'state': 'normal', - 'coda_st_naming': '%(code)s/%(y)s/%(coda)s', - 'active': True, - 'find_payment': _check_account_pain, - 'find_bbacom': True, - 'find_inv_number': True, - 'find_partner': True, - 'update_partner': True, - 'balance_start_enforce': True, - 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, - } - _sql_constraints = [ - ('account_uniq_1', 'unique (bank_id, description1, currency)', 'The combination of Bank Account, Account Description and Currency must be unique !'), - ('account_uniq_2', 'unique (bank_id, description2, currency)', 'The combination of Bank Account, Account Description and Currency must be unique !'), - ] - _constraints = [ - (_check_currency, '\n\nConfiguration Error! \nThe Bank Account Currency should match the Journal Currency !', ['currency', 'journal']), - ] - _order = 'name' - - def name_get(self, cr, uid, ids, context=None): - res = [] - if not len(ids): - return res - for id in self.browse(cr, uid, ids, context=context): - res.append((id.id, (id.bank_id.iban or id.bank_id.acc_number) + ' (' + id.currency.name + ')' + \ - (id.description1 and (' - ' + id.description1) or ''))) - return res - - def copy(self, cr, uid, id, default=None, context=None): - cba = self.browse(cr, uid, id, context=context) - if not default: - default = {} - default = default.copy() - default.update({'journal_id': None}) - default['description1'] = cba['description1'] or '' - default['description2'] = cba['description2'] or '' - default['name'] = (cba['name'] or '') + ' (copy)' - default['state'] = cba['state'] - return super(coda_bank_account, self).copy(cr, uid, id, default, context) - - def onchange_state(self, cr, uid, ids, state): - return state == 'info' and {'value': {'journal': None}} or {} - -coda_bank_account() - - -class account_coda(osv.osv): - _name = 'account.coda' - _description = 'Object to store CODA Data Files' - _order = 'coda_creation_date desc' - _columns = { - 'name': fields.char('CODA Filename', size=128, readonly=True), - 'coda_data': fields.binary('CODA File', readonly=True), - 'statement_ids': fields.one2many('coda.bank.statement', 'coda_id', 'Generated CODA Bank Statements', readonly=True), - 'note': fields.text('Import Log', readonly=True), - 'coda_creation_date': fields.date('CODA Creation Date', readonly=True, select=True), - 'date': fields.date('Import Date', readonly=True, select=True), - 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True), - 'company_id': fields.many2one('res.company', 'Company', readonly=True) - } - _defaults = { - 'date': fields.date.context_today, - 'user_id': lambda self, cr, uid, context: uid, - 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c), - } - _sql_constraints = [ - ('coda_uniq', 'unique (name, coda_creation_date)', 'This CODA has already been imported !') - ] - - def unlink(self, cr, uid, ids, context=None): - if context is None: - context = {} - context.update({'coda_unlink': True}) - coda_st_obj = self.pool.get('coda.bank.statement') - bank_st_obj = self.pool.get('account.bank.statement') - for coda in self.browse(cr, uid, ids, context=context): - for coda_statement in coda.statement_ids: - if not context.get('coda_statement_unlink', False): - if coda_st_obj.exists(cr, uid, coda_statement.id, context=context): - coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context) - if not context.get('bank_statement_unlink', False): - if coda_st_obj.exists(cr, uid, coda_statement.id, context=context) and (coda_statement.type == 'normal') and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) - context.update({'coda_unlink': False}) - return super(account_coda, self).unlink(cr, uid, ids, context=context) - -account_coda() - - -class account_coda_trans_type(osv.osv): - _name = 'account.coda.trans.type' - _description = 'CODA transaction type' - _rec_name = 'type' - _columns = { - 'type': fields.char('Transaction Type', size=1, required=True), - 'parent_id': fields.many2one('account.coda.trans.type', 'Parent'), - 'description': fields.text('Description', translate=True), - } -account_coda_trans_type() - - -class account_coda_trans_code(osv.osv): - _name = 'account.coda.trans.code' - _description = 'CODA transaction code' - _rec_name = 'code' - _columns = { - 'code': fields.char('Code', size=2, required=True, select=1), - 'type': fields.selection([ - ('code', 'Transaction Code'), - ('family', 'Transaction Family')], - 'Type', required=True, select=1), - 'parent_id': fields.many2one('account.coda.trans.code', 'Family', select=1), - 'description': fields.char('Description', size=128, translate=True, select=2), - 'comment': fields.text('Comment', translate=True), - } -account_coda_trans_code() - - -class account_coda_trans_category(osv.osv): - _name = 'account.coda.trans.category' - _description = 'CODA transaction category' - _rec_name = 'category' - _columns = { - 'category': fields.char('Transaction Category', size=3, required=True), - 'description': fields.char('Description', size=256, translate=True), - } -account_coda_trans_category() - - -class account_coda_comm_type(osv.osv): - _name = 'account.coda.comm.type' - _description = 'CODA structured communication type' - _rec_name = 'code' - _columns = { - 'code': fields.char('Structured Communication Type', size=3, required=True, select=1), - 'description': fields.char('Description', size=128, translate=True), - } - _sql_constraints = [ - ('code_uniq', 'unique (code)', 'The Structured Communication Code must be unique !') - ] -account_coda_comm_type() - - -class coda_bank_statement(osv.osv): - _name = 'coda.bank.statement' - _description = 'CODA Bank Statement' - - def _default_journal_id(self, cr, uid, context={}): - if context.get('journal_id', False): - return context['journal_id'] - return False - - def _end_balance(self, cursor, user, ids, name, attr, context=None): - res = {} - statements = self.browse(cursor, user, ids, context=context) - for statement in statements: - res[statement.id] = statement.balance_start - for line in statement.line_ids: - res[statement.id] += line.amount - for r in res: - res[r] = round(res[r], 2) - return res - - def _get_period(self, cr, uid, context={}): - periods = self.pool.get('account.period').find(cr, uid) - if periods: - return periods[0] - else: - return False - - _order = 'date desc' - _columns = { - 'name': fields.char('Name', size=64, required=True, readonly=True), - 'date': fields.date('Date', required=True, readonly=True), - 'coda_creation_date': fields.date('CODA Creation Date', readonly=True), - 'old_balance_date': fields.date('Old Balance Date', readonly=True), - 'new_balance_date': fields.date('New Balance Date', readonly=True), - 'coda_id': fields.many2one('account.coda', 'CODA Data File', ondelete='cascade'), - 'type': fields.selection([ - ('normal', 'Normal'), - ('info', 'Info')], - 'Type', required=True, readonly=True, - help='No Bank Statements are associated with CODA Bank Statements of type \'Info\'.'), - 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'), - 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, domain=[('type', '=', 'bank')]), - 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True), - 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True), - 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'), readonly=True), - 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), readonly=True), - 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'), - 'line_ids': fields.one2many('coda.bank.statement.line', - 'statement_id', 'CODA Bank Statement lines', readonly=True), - 'currency': fields.many2one('res.currency', 'Currency', required=True, readonly=True, - help='The currency of the CODA Bank Statement'), - 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), - } - _defaults = { - 'type': 'normal', - 'currency': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, - 'journal_id': _default_journal_id, - 'period_id': _get_period, - } - - def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): - if context is None: - context = {} - res = super(coda_bank_statement, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, - context=context, count=count) - if context.get('bank_statement', False) and not res: - raise osv.except_osv('Warning', _('No CODA Bank Statement found for this Bank Statement!')) - return res - - def unlink(self, cr, uid, ids, context=None): - if context is None: - context = {} - context.update({'coda_statement_unlink': True}) - coda_obj = self.pool.get('account.coda') - bank_st_obj = self.pool.get('account.bank.statement') - - # find all CODA bank statements that are associated with the selected CODA bank statements via a common CODA file - new_ids = [] - for coda_statement in self.browse(cr, uid, ids, context=context): - if coda_obj.exists(cr, uid, coda_statement.coda_id.id, context=context): - new_ids += [x.id for x in coda_obj.browse(cr, uid, coda_statement.coda_id.id, context=context).statement_ids] - - # unlink CODA banks statements as well as associated bank statements and CODA files - for coda_statement in self.browse(cr, uid, new_ids, context=context): - if coda_statement.statement_id.state == 'confirm': - raise osv.except_osv(_('Invalid action !'), - _("Cannot delete CODA Bank Statement '%s' of Journal '%s'." \ - "\nThe associated Bank Statement has already been confirmed !" \ - "\nPlease undo this action first!") \ - % (coda_statement.name, coda_statement.journal_id.name)) - else: - if not context.get('coda_unlink', False): - if coda_statement.coda_id and coda_obj.exists(cr, uid, coda_statement.coda_id.id, context=context): - coda_obj.unlink(cr, uid, [coda_statement.coda_id.id], context=context) - if not context.get('bank_statement_unlink', False): - if coda_statement.statement_id and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context): - bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context) - - context.update({'coda_statement_unlink': False}) - return super(coda_bank_statement, self).unlink(cr, uid, new_ids, context=context) - -coda_bank_statement() - - -class account_bank_statement(osv.osv): - _inherit = 'account.bank.statement' - _columns = { - 'coda_statement_id': fields.many2one('coda.bank.statement', 'Associated CODA Bank Statement'), - } - # _sql_constraints = [ - # ('name_company_uniq', 'unique (name,company_id)', 'The name of the Bank Statement must be unique per company !') - # ] - - def unlink(self, cr, uid, ids, context=None): - if context is None: - context = {} - context.update({'bank_statement_unlink': True}) - coda_obj = self.pool.get('account.coda') - coda_st_obj = self.pool.get('coda.bank.statement') - - # find all statements that are associated with the selected bank statements via a common CODA file - ids_plus = [] - for statement in self.browse(cr, uid, ids, context=context): - if statement.coda_statement_id: - for x in coda_obj.browse(cr, uid, statement.coda_statement_id.coda_id.id, context=context).statement_ids: - if x.type == 'normal': - ids_plus += [x.statement_id.id] - - # unlink banks statements as well as associated CODA bank statements and CODA files - for statement in self.browse(cr, uid, ids_plus, context=context): - if not context.get('coda_statement_unlink', False): - if statement.coda_statement_id and coda_st_obj.exists(cr, uid, statement.coda_statement_id.id, context=context): - coda_st_obj.unlink(cr, uid, [statement.coda_statement_id.id], context=context) - if not context.get('coda_unlink', False): - if statement.coda_statement_id \ - and coda_st_obj.exists(cr, uid, statement.coda_statement_id.id, context=context) \ - and statement.coda_statement_id.coda_id \ - and coda_obj.exists(cr, uid, statement.coda_statement_id.coda_id.id, context=context): - coda_obj.unlink(cr, uid, [statement.coda_statement_id.coda_id.id], context=context) - - context.update({'bank_statement_unlink': False}) - new_ids = list(set(ids + ids_plus)) - return super(account_bank_statement, self).unlink(cr, uid, new_ids, context=context) - -account_bank_statement() - - -class coda_bank_statement_line(osv.osv): - _name = 'coda.bank.statement.line' - _order = 'sequence' - _description = 'CODA Bank Statement Line' - _columns = { - 'name': fields.char('Communication', size=268, required=True), - 'sequence': fields.integer('Sequence'), - 'date': fields.date('Entry Date', required=True), - 'val_date': fields.date('Valuta Date'), - 'account_id': fields.many2one('account.account', 'Account'), - 'type': fields.selection([ - ('supplier', 'Supplier'), - ('customer', 'Customer'), - ('general', 'General'), - ('globalisation', 'Globalisation'), - ('information', 'Information'), - ('communication', 'Free Communication'), - ], 'Type', required=True), - 'globalisation_level': fields.integer('Globalisation Level', - help="The value which is mentioned (1 to 9), specifies the hierarchy level" - " of the globalisation of which this record is the first." - "\nThe same code will be repeated at the end of the globalisation."), - 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')), - 'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID', readonly=True, - help="Code to identify transactions belonging to the same globalisation level within a batch payment"), - 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), - 'partner_id': fields.many2one('res.partner', 'Partner'), - 'counterparty_name': fields.char('Counterparty Name', size=35), - 'counterparty_bic': fields.char('Counterparty BIC', size=11), - 'counterparty_number': fields.char('Counterparty Number', size=34), - 'counterparty_currency': fields.char('Counterparty Currency', size=3), - 'payment_reference': fields.char('Payment Reference', size=35, - help="Payment Reference. For SEPA (SCT or SDD) transactions, the PaymentInformationIdentification "\ - "is recorded in this field pertaining to a globalisation, and the EndToEndReference for " \ - "simple transactions or for the details of a globalisation."), - 'statement_id': fields.many2one('coda.bank.statement', 'CODA Bank Statement', - select=True, required=True, ondelete='cascade'), - 'coda_bank_account_id': fields.related('statement_id', 'coda_bank_account_id', type='many2one', relation='coda.bank.account', string='Bank Account', store=True, readonly=True), - 'ref': fields.char('Reference', size=32), - 'note': fields.text('Notes'), - 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), - } - - #TODO : Check this function. account_bank_statement_line Seems undefined : ) - def unlink(self, cr, uid, ids, context=None): - if context is None: - context = {} - if context.get('block_statement_line_delete', False): - raise osv.except_osv('Warning', _('Delete operation not allowed !')) - return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context) - -coda_bank_statement_line() - - -class account_bank_statement_line_global(osv.osv): - _inherit = 'account.bank.statement.line.global' - _columns = { - 'coda_statement_line_ids': fields.one2many('coda.bank.statement.line', 'globalisation_id', 'CODA Bank Statement Lines', readonly=True), - } -account_bank_statement_line_global() - - -class coda_account_mapping_rule(osv.osv): - _name = 'coda.account.mapping.rule' - _description = 'Rules Engine to assign accounts during CODA parsing' - _order = 'sequence' - _columns = { - 'coda_bank_account_id': fields.many2one('coda.bank.account', 'CODA Bank Account', ondelete='cascade'), - 'sequence': fields.integer('Sequence', help='Determines the order of the rules to assign accounts'), - 'name': fields.char('Rule Name', size=128, required=True), - # matching criteria - 'trans_type_id': fields.many2one('account.coda.trans.type', 'Transaction Type'), - 'trans_family_id': fields.many2one('account.coda.trans.code', 'Transaction Family', domain=[('type', '=', 'family')]), - 'trans_code_id': fields.many2one('account.coda.trans.code', 'Transaction Code', domain=[('type', '=', 'code')]), - 'trans_category_id': fields.many2one('account.coda.trans.category', 'Transaction Category'), - 'struct_comm_type_id': fields.many2one('account.coda.comm.type', 'Structured Communication Type'), - 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'), - # resulting general account - 'account_id': fields.many2one('account.account', 'Account', ondelete='cascade', required=True, domain=[('type', '!=', 'view')]), - 'active': fields.boolean('Active', help='Switch on/off this rule.'), - } - _defaults = { - 'active': True, - } - - def account_id_get(self, cr, uid, coda_bank_account_id, trans_type_id=None, trans_family_id=None, - trans_code_id=None, trans_category_id=None, struct_comm_type_id=None, partner_id=None, context=None): - cr.execute('SELECT account_id, trans_type_id, trans_family_id, trans_code_id, trans_category_id, struct_comm_type_id, partner_id ' \ - 'FROM coda_account_mapping_rule ' \ - 'WHERE active = TRUE AND coda_bank_account_id = %s ' \ - 'ORDER BY sequence' % coda_bank_account_id - ) - rules = cr.fetchall() - condition = '(not rule[1] or (trans_type_id == rule[1])) and (not rule[2] or (trans_family_id == rule[2])) ' \ - 'and (not rule[3] or (trans_code_id == rule[3])) and (not rule[4] or (trans_category_id == rule[4])) ' \ - 'and (not rule[5] or (struct_comm_type_id == rule[5])) and (not rule[6] or (partner_id == rule[6]))' - account_id = None - for rule in rules: - if eval(condition): - account_id = rule[0] - break - return account_id - -coda_account_mapping_rule() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/l10n_be_coda_comm_type.xml b/addons/l10n_be_coda/l10n_be_coda_comm_type.xml deleted file mode 100644 index 9a042ec48d2..00000000000 --- a/addons/l10n_be_coda/l10n_be_coda_comm_type.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - 001 - Data concerning the counterparty - - - 002 - Communication of the bank - - - 003 - RBP data - - - 004 - Counterparty’s banker - - - 005 - Data concerning the correspondent - - - 006 - Information concerning the detail amount - - - 007 - Information concerning the detail cash - - - 008 - Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD) - - - 009 - Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD) - - - 010 - Information pertaining to sale or purchase of securities - - - 011 - Information pertaining to coupons - - - 100 - (SEPA) payment with a structured format communication applying the ISO standard 11649: Structured creditor reference to remittance information - - - 101 - Credit transfer or cash payment with structured format communication - - - 102 - Credit transfer or cash payment with reconstituted structured format communication - - - 103 - number (e.g. of the cheque, of the card, etc.) - - - 104 - Equivalent in EUR - - - 105 - original amount of the transaction - - - 106 - Method of calculation (VAT, withholding tax on income, commission, etc.) - - - 107 - Direct debit – DOM’80 - - - 108 - Closing - - - 111 - POS credit – Globalisation - - - 112 - ATM payment (usually Eurocheque card) - - - 113 - ATM/POS debit - - - 114 - POS credit - individual transaction - - - 115 - Terminal cash deposit - - - 120 - Correction of a transaction - - - 121 - Commercial bills - - - 122 - Bills - calculation of interest - - - 123 - Fees and commissions - - - 124 - Number of the credit card - - - 125 - Credit - - - 126 - Term investments - - - 127 - European direct debit (SEPA) - - - - diff --git a/addons/l10n_be_coda/l10n_be_coda_trans_category.xml b/addons/l10n_be_coda/l10n_be_coda_trans_category.xml deleted file mode 100644 index 192240cf8aa..00000000000 --- a/addons/l10n_be_coda/l10n_be_coda_trans_category.xml +++ /dev/null @@ -1,440 +0,0 @@ - - - - - - - 000 - Net amount - - - 001 - Interest received - - - 002 - Interest paid - - - 003 - Credit commission - - - 004 - Postage - - - 005 - Renting of letterbox - - - 006 - Various fees/commissions - - - 007 - Access right to database - - - 008 - Information charges - - - 009 - Travelling expenses - - - 010 - Writ service fee - - - 011 - VAT - - - 012 - Exchange commission - - - 013 - Payment commission - - - 014 - Collection commission - - - 015 - Correspondent charges - - - 016 - BLIW/IBLC dues - - - 017 - Research costs - - - 018 - Tental guarantee charges - - - 019 - Tax on physical delivery - - - 020 - Costs of physical delivery - - - 021 - Costs for drawing up a bank cheque - - - 022 - Priority costs - - - 023 - Exercising fee - - - 024 - Growth premium - - - 025 - Individual entry for exchange charges - - - 026 - Handling commission - - - 027 - Charges for unpaid bills - - - 028 - Fidelity premium - - - 029 - Protest charges - - - 030 - Account insurance - - - 031 - Charges foreign cheque - - - 032 - Drawing up a circular cheque - - - 033 - Charges for a foreign bill - - - 034 - Reinvestment fee - - - 035 - Charges foreign documentary bill - - - 036 - Costs relating to a refused cheque - - - 037 - Commission for handling charges - - - 039 - Telecommunications - - - 041 - Credit card costs - - - 042 - Payment card costs - - - 043 - Insurance costs - - - 045 - Handling costs - - - 047 - Charges extension bill - - - 049 - Fiscal stamps/stamp duty - - - 050 - Capital term investment - - - 051 - Withholding tax - - - 052 - Residence state tax - - - 053 - Printing of forms - - - 055 - Repayment loan or credit capital - - - 057 - Interest subsidy - - - 058 - Capital premium - - - 059 - Default interest - - - 061 - Charging fees for transactions - - - 063 - Rounding differences - - - 065 - Interest payment advice - - - 066 - Fixed loan advance - reimbursement - - - 067 - Fixed loan advance - extension - - - 068 - Countervalue of an entry - - - 069 - Forward arbitrage contracts : sum to be supplied by customer - - - 070 - Forward arbitrage contracts : sum to be supplied by bank - - - 071 - Fixed loan advance - availability - - - 072 - Countervalue of commission to third party - - - 073 - Costs of ATM abroad - - - 074 - Mailing costs - - - 100 - Gross amount - - - 200 - Overall documentary credit charges - - - 201 - Advice notice commission - - - 202 - Advising commission | Additional advising commission - - - 203 - Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission - - - 204 - Amendment fee - - - 205 - Documentary payment commission | Document commission | Drawdown fee | Negotiation fee - - - 206 - Surety fee/payment under reserve - - - 207 - Non-conformity fee - - - 208 - Commitment fee deferred payment - - - 209 - Transfer commission - - - 210 - Commitment fee - - - 211 - Credit arrangement fee | Additional credit arrangement fee - - - 212 - Warehousing fee - - - 213 - Financing fee - - - 214 - Issue commission (delivery order) - - - 400 - Acceptance fee - - - 401 - Visa charges - - - 402 - Certification costs - - - 403 - Minimum discount rate - - - 404 - Discount commission - - - 405 - Bill guarantee commission - - - 406 - Collection charges - - - 407 - Costs Article 45 - - - 408 - Cover commission - - - 409 - Safe deposit charges - - - 410 - Reclamation charges - - - 411 - Fixed collection charge - - - 412 - Advice of expiry charges - - - 413 - Acceptance charges - - - 414 - Regularisation charges - - - 415 - Surety fee - - - 416 - Charges for the deposit of security - - - 418 - Endorsement commission - - - 419 - Bank service fee - - - 420 - Retention charges - - - 425 - Foreign broker's commission - - - 426 - Belgian broker's commission - - - 427 - Belgian Stock Exchange tax - - - 428 - Interest accrued - - - 429 - Foreign Stock Exchange tax - - - 430 - Recovery of foreign tax - - - 431 - Delivery of a copy - - - - diff --git a/addons/l10n_be_coda/l10n_be_coda_trans_code.xml b/addons/l10n_be_coda/l10n_be_coda_trans_code.xml deleted file mode 100644 index b2b23d59bef..00000000000 --- a/addons/l10n_be_coda/l10n_be_coda_trans_code.xml +++ /dev/null @@ -1,1914 +0,0 @@ - - - - - - - 00 - family - Undefined transactions - - - 00 - code - - Undefined transaction - - - 33 - code - - Value correction - - - 35 - code - - Correction - - - 37 - code - - Costs - - - 39 - code - - Cancellation of a transaction - - - 83 - code - - Value correction - - - 85 - code - - Correction - - - 87 - code - - Costs refunded - - - 89 - code - - Cancellation of a transaction - - - 01 - family - Domestic or local SEPA credit transfers - - - 01 - code - - Individual transfer order - Credit transfer given by the customer on paper or electronically, even if the execution date of this transfer is in the future. Domestic payments as well as euro payments meeting the requirements. - - - 02 - code - - Individual transfer order initiated by the bank - The bank takes the initiative for debiting the customer’s account. - - - 03 - code - - Standing order - Credit transfer for which the order has been given once and which is carried out again at regular intervals without any change. - - - 05 - code - - Payment of wages, etc. - The principal will be debited for the total amount of the file entered. - - - 07 - code - - Collective transfer - The principal will be debited for the total amount of the file entered. - - - 09 - code - - Your semi-standing order - - - 11 - code - - Your semi-standing order – payment to employees - - - 13 - code - - Transfer from your account - Transfer from one account to another account of the same customer at the bank's or the customer's initiative (intracompany). - - - 15 - code - - Balance due insurance premium - - - 17 - code - - Financial centralisation - In case of centralisation by the bank, type 2 will be allotted to this transaction. This total can be followed by the detailed movement. - - - 37 - code - - Costs - - - 39 - code - - Your issue circular cheque - To be used for issued circular cheques given in consignment - - - 49 - code - - Cancellation or correction - - - 50 - code - - Transfer in your favour - - - 51 - code - - Transfer in your favour – initiated by the bank - The bank takes the initiative for crediting the customer’s account. - - - 52 - code - - Payment in your favour - Payment by a third person - - - 54 - code - - Unexecutable transfer order - - - 60 - code - - Non-presented circular cheque - - - 62 - code - - Unpaid postal order - - - 64 - code - - Transfer to your account - Intracompany - - - 66 - code - - Financial centralization - In case of centralisation by the bank, type 2 will be allotted to this transaction. This total can be followed by the detailed movement. - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 03 - family - Cheques - - - 01 - code - - Payment of your cheque - - - 03 - code - - Your purchase by payment card - - - 05 - code - - Payment of voucher - Payment of holiday pay, etc. - - - 07 - code - - Definitely unpaid cheque - - - 09 - code - - Unpaid voucher - - - 11 - code - - Department store cheque - - - 13 - code - - Eurocheque written out abroad - - - 15 - code - - Your purchase bank cheque - Cheque drawn by the bank on itself, usually with charges. - - - 17 - code - - Your certified cheque - Amount of the cheque; if any, charges receive code 37 - - - 19 - code - - Settlement of credit cards - - - 35 - code - - Cash advance - - - 37 - code - - Cheque-related costs - - - 38 - code - - Provisionally unpaid - - - 39 - code - - Provisionally unpaid due to other reason than manual presentation - - - 49 - code - - Cancellation or correction - - - 50 - code - - Credit of a payment via terminal - - - 52 - code - - First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve - - - 56 - code - - Non-presented certified cheques - - - 58 - code - - Remittance of cheques, vouchers, etc. credit after collection - Also for vouchers, postal orders, anything but bills of exchange, acquittances, promissory notes, etc. - - - 60 - code - - Reversal of voucher - - - 62 - code - - Reversal of cheque - cheques debited on account, but debit cancelled afterwards for lack of cover (double debit/contra-entry of transaction 01 or 05) - - - 63 - code - - Second credit of unpaid cheque - - - 64 - code - - Reversal of settlement of credit card - - - 66 - code - - Remittance of cheque by your branch - credit under usual reserve - - - 68 - code - - Credit of a payment via electronic purse - - - 87 - code - - Reimbursement of cheque-related costs - Overall amount, VAT included - - - 99 - code - - Cancellation or correction - - - 04 - family - Cards - - - 01 - code - - Loading a GSM card - Debit customer who is loading - - - 02 - code - - Payment by means of a payment card within the Eurozone - Eurozone = countries which have the euro as their official currency - - - 03 - code - - Settlement credit cards - See annexe III : communication 124 - - - 04 - code - - Cash withdrawal from an ATM - At home as well as abroad - - - 05 - code - - Loading Proton - - - 06 - code - - Payment with tank card - - - 07 - code - - Payment by GSM - - - 08 - code - - Payment by means of a payment card outside the Eurozone - Eurozone = countries which have the euro as their official currency - - - 37 - code - - Costs - Various costs for possessing or using a payment card - - - 49 - code - - Cancellation or correction - - - 50 - code - - Credit after a payment at a terminal - Except Proton - - - 51 - code - - Unloading Proton - - - 52 - code - - Loading GSM cards - Credit provider - - - 53 - code - - Cash deposit at an ATM - - - 55 - code - - Income from payments by GSM - - - 68 - code - - Credit after Proton payments - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 05 - family - Direct debit - - - 01 - code - - Payment - - - 03 - code - - Unpaid debt - - - 05 - code - - Reimbursement - - - 37 - code - - Costs - - - 49 - code - - Cancellation or correction - - - 50 - code - - Credit after collection - - - 52 - code - - Credit under usual reserve - - - 54 - code - - Reimbursement - - - 56 - code - - Unexecutable reimbursement - - - 58 - code - - Reversal - (cancellation of an undue debit of the debtor at the initiative of the financial institution or the debtor for lack of cover) - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 07 - family - Domestic commercial paper - - - 01 - code - - Payment commercial paper - Bills of exchange, acquittances, promissory notes; debit of the drawee - - - 03 - code - - Payment receipt card - - - 05 - code - - Commercial paper claimed back - Bill claimed back at the drawer's request (bill claimed back before maturity date) - - - 06 - code - - Extension of maturity date - Costs chargeable to the remitter - - - 07 - code - - Unpaid commercial paper - Contra-entry of a direct credit or of a discount - - - 08 - code - - Payment in advance - Debit of the remitter when the drawee pays in advance directly to the remitter (regards bank acceptances) - - - 09 - code - - Agio on supplier's bill - Debit of the agios to the account of the drawee - - - 10 - code - - Renewal of agreed maturity date - - - 12 - code - - Safe custody - - - 14 - code - - Warrant fallen due - - - 37 - code - - Costs related to commercial paper - If any, detail in the category (e.g. costs for presentation for acceptance, etc.) - - - 39 - code - - Return of an irregular bill of exchange - Debit of the drawer after credit under usual reserve or discount - - - 49 - code - - Cancellation or correction - - - 50 - code - - Remittance of commercial paper - credit after collection - Credit of the remitter - - - 52 - code - - Remittance of commercial paper - credit under usual reserve - - - 54 - code - - Remittance of commercial paper for discount - Among other things advances or promissory notes - - - 56 - code - - Remittance of supplier's bill with guarantee - - - 58 - code - - Remittance of supplier's bill without guarantee - - - 64 - code - - Warrant - - - 86 - code - - Payment after cession - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 09 - family - Counter transactions - - - 01 - code - - Cash withdrawal - Withdrawal by counter cheque or receipt; cash remitted by the bank clerk - - - 03 - code - - Cash withdrawal by card (ATM) - - - 05 - code - - Purchase of foreign bank notes - - - 07 - code - - Purchase of gold/pieces - - - 09 - code - - Purchase of petrol coupons - - - 11 - code - - Your purchase of luncheon vouchers - - - 13 - code - - Cash withdrawal by your branch or agents - On the account of the head office - - - 15 - code - - Your purchase of lottery tickets - - - 17 - code - - Purchase of fiscal stamps - - - 19 - code - - Difference in payment - Used in case of payments accepted under reserve of count, result of overcrediting - - - 21 - code - - Cash withdrawal on card (PROTON) - - - 25 - code - - Purchase of traveller’s cheque - - - 37 - code - - Costs - - - 49 - code - - Cancellation or correction - - - 50 - code - - Cash payment - For own account - the comment for the client is given in the communication; also for mixed payments (cash + cheques) - not to be communicated to the clients; for payments made by a third person: see family 01 - - - 52 - code - - Payment night safe - - - 54 - code - - Your payment ATM - - - 56 - code - - Reserve - - - 58 - code - - Payment by your branch/agents - Takes priority over transaction 52 (hence a payment made by an agent in a night safe = 58 and not 52) - - - 60 - code - - Sale of foreign bank notes - - - 62 - code - - Sale of gold/pieces under usual reserve - - - 64 - code - - Your winning lottery ticket - - - 66 - code - - Repurchase of petrol coupons - - - 68 - code - - Difference in payment - In case of payment accepted under reserve of count; result of undercrediting - see also transaction 19 - - - 70 - code - - Sale of traveller’s cheque - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 11 - family - Securities - - - 01 - code - - Purchase of securities - Purchase of domestic or foreign securities, including subscription rights, certificates, etc. - - - 02 - code - - Tenders - Payment to the bank on maturity date - - - 03 - code - - Subscription to securities - Bonds, shares, tap issues of CDs, with or without payment of interest, etc. - - - 04 - code - - Issues - - - 05 - code - - Partial payment subscription - Debit of the subscriber for the complementary payment of partly-paid shares - - - 06 - code - - Share option plan – exercising an option - - - 09 - code - - Settlement of securities - For professionals (stockbrokers) only, whoever the issuer may be (Belgian or foreigner) - - - 11 - code - - Payable coupons/repayable securities - Debit of the issuer by the bank in charge of the financial service - - - 13 - code - - Your repurchase of issue - Unissued part (see 64) - - - 15 - code - - Interim interest on subscription - In case of subscription before the interest due date - - - 17 - code - - Management fee - - - 19 - code - - Regularisation costs - - - 37 - code - - Costs - - - 49 - code - - Cancellation or correction - - - 50 - code - - Sale of securities - - - 51 - code - - Tender - Company issues paper in return for cash - - - 52 - code - - Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve - Whatever the currency of the security - - - 56 - code - - Reserve - - - 58 - code - - Repayable securities from a deposit or delivered at the counter - credit under usual reserve - - - 62 - code - - Interim interest on subscription - When reimbursed separately to the subscriber - - - 64 - code - - Your issue - Amount paid to the issuer by the bank in charge of the placement (firm underwriting or not); also used for the payment in full of partly-paid shares, see transaction 05 - - - 66 - code - - Retrocession of issue commission - For professionals such as insurances and stockbrokers - - - 68 - code - - Compensation for missing coupon - In case coupons attached to a purchased security are missing - - - 70 - code - - Settlement of securities - Only with stockbrokers when they deliver the securities to the bank - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 13 - family - Credit - - - 01 - code - - Short-term loan - Capital and/or interest (specified by the category) - - - 02 - code - - Long-term loan - - - 05 - code - - Settlement of fixed advance - Full or partial reimbursement of a fixed advance at maturity date - - - 07 - code - - Your repayment instalment credits - Often by standing order or direct debit. In case of direct debit, family 13 is used. - - - 11 - code - - Your repayment mortgage loan - - - 13 - code - - Settlement of bank acceptances - - - 15 - code - - Your repayment hire-purchase and similar claims - Hire-purchase agreement under which the financial institution is the lessor - - - 19 - code - - Documentary import credits - - - 21 - code - - Other credit applications - - - 37 - code - - Credit-related costs - - - 49 - code - - Cancellation or correction - - - 50 - code - - Settlement of instalment credit - - - 54 - code - - Fixed advance – capital and interest - - - 55 - code - - Fixed advance – interest only - - - 56 - code - - Subsidy - Interest or capital subsidy - - - 60 - code - - Settlement of mortgage loan - - - 62 - code - - Term loan - - - 68 - code - - Documentary export credits - - - 70 - code - - Settlement of discount bank acceptance - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 30 - family - Various transactions - - - 01 - code - - Spot purchase of foreign exchange - - - 03 - code - - Forward purchase of foreign exchange - - - 05 - code - - Capital and/or interest term investment - - - 33 - code - - Value (date) correction - - - 37 - code - - Costs - - - 39 - code - - Undefined transaction - - - 49 - code - - Cancellation or correction - - - 50 - code - - Spot sale of foreign exchange - - - 52 - code - - Forward sale of foreign exchange - - - 54 - code - - Capital and/or interest term investment - - - 55 - code - - Interest term investment - - - 83 - code - - Value (date) correction - - - 87 - code - - Reimbursement of costs - - - 89 - code - - Undefined transaction - - - 99 - code - - Cancellation or correction - - - 35 - family - Closing (periodical settlements for interest, costs,…) - - - 01 - code - - Closing - - - 37 - code - - Costs - - - 49 - code - - Cancellation or correction - - - 50 - code - - Closing - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 41 - family - International credit transfers - non-SEPA credit transfers - - - 01 - code - - Transfer - - - 03 - code - - Standing order - - - 05 - code - - Collective payments of wages - - - 07 - code - - Collective transfers - - - 13 - code - - Transfer from your account - Intracompany - - - 17 - code - - Financial centralisation (debit) - - - 37 - code - - Costs relating to outgoing foreign transfers and non-SEPA transfers - - - 38 - code - - Costs relating to incoming foreign and non-SEPA transfers - - - 49 - code - - Cancellation or correction - - - 50 - code - - Transfer - - - 64 - code - - Transfer to your account - Intracompany - - - 66 - code - - Financial centralisation (credit) - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 43 - family - Foreign cheques - - - 01 - code - - Payment of a foreign cheque - Debit of a cheque in foreign currency or in EUR in favour of a foreigner - - - 07 - code - - Unpaid foreign cheque - Foreign cheque remitted for collection that returns unpaid - - - 15 - code - - Purchase of an international bank cheque - - - 37 - code - - Costs relating to payment of foreign cheques - - - 49 - code - - Cancellation or correction - - - 52 - code - - Remittance of foreign cheque credit under usual reserve - - - 58 - code - - Remittance of foreign cheque credit after collection - - - 62 - code - - Reversal of cheques - - - 70 - code - - Purchase of traveller’s cheque - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 47 - family - Foreign commercial paper - - - 01 - code - - Payment of foreign bill - - - 05 - code - - Bill claimed back - - - 06 - code - - Extension - - - 07 - code - - Unpaid foreign bill - - - 11 - code - - Payment documents abroad - Bills of lading - - - 13 - code - - Discount foreign supplier's bills - Debit customer, payment of agios, interest, exchange commission, etc. - - - 14 - code - - Warrant fallen due - - - 37 - code - - Costs relating to the payment of a foreign bill - - - 49 - code - - Cancellation or correction - - - 50 - code - - Remittance of foreign bill credit after collection - - - 52 - code - - Remittance of foreign bill credit under usual reserve - - - 54 - code - - Discount abroad - - - 56 - code - - Remittance of guaranteed foreign supplier's bill - - - 58 - code - - Idem without guarantee - - - 60 - code - - Remittance of documents abroad - credit under usual reserve - - - 62 - code - - Remittance of documents abroad - credit after collection - - - 64 - code - - Warrant - - - 87 - code - - Reimbursement of costs - - - 99 - code - - Cancellation or correction - - - 49 - family - Foreign counter transactions - - - 03 - code - - ATM withdrawal - - - 80 - family - Separately charged costs and provisions - - - 01 - code - - Guarantee card charges - - - 02 - code - - Costs relating to electronic output - - - 03 - code - - Payment card charges - - - 04 - code - - Costs for holding a documentary cash credit - - - 05 - code - - Card charges - - - 06 - code - - Damage relating to bills and cheques - - - 07 - code - - Insurance costs - - insurance costs of account holders against fatal accidents - passing-on of several insurance costs - - - 08 - code - - Registering compensation for savings accounts - - - 09 - code - - Postage - Postage recouped to the debit of the customer (including forwarding charges) - - - 10 - code - - Purchase of Smartcard - - - 11 - code - - Costs for the safe custody of correspondence - Costs chargeable to clients who ask to have their correspondence kept at their disposal at the bank's counter - - - 12 - code - - Costs for opening a bank guarantee - - - 13 - code - - Renting of safes - Commission for renting a safe deposit box - - - 14 - code - - Handling costs instalment credit - - - 15 - code - - Night safe - Commission collected to the debit of the customer to whom the bank delivers a key which gives access to the night safe - - - 16 - code - - Bank confirmation to revisor or accountant - - - 17 - code - - Charge for safe custody - Collected for unsealed deposit of securities, and other parcels - - - 18 - code - - Trade information - - - 19 - code - - Special charge for safe custody - Collected for securities, gold, pass-books, etc. placed in safe custody - - - 20 - code - - Drawing up a certificate - - - 21 - code - - Pay-packet charges - Charges for preparing pay packets - - - 22 - code - - Management/custody - - - 23 - code - - Research costs - Costs charged for all kinds of research (information on past transactions, address retrieval, ...) - - - 24 - code - - Participation in and management of interest refund system - - - 25 - code - - Renting of direct debit box - Commission for the renting of boxes put at the disposal for the correspondence - - - 26 - code - - Travel insurance premium - - - 27 - code - - Subscription fee - For publications of the financial institution - - - 29 - code - - Information charges - Charges collected for: - commercial information - sundry information - - - 31 - code - - Writ service fee - E.g. for signing invoices - - - 33 - code - - Miscellaneous fees and commissions - Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at least 3 articles) - - - 35 - code - - Costs - Costs charged for calculating the amount of the tax to be paid (e.g. Fiscomat). - - - 37 - code - - Access right to database - Fixed right, either one-off or periodical; for details, see "categories" - - - 39 - code - - Surety fee - Agios on guarantees given - - - 41 - code - - Research costs - - - 43 - code - - Printing of forms - - - 45 - code - - Documentary credit charges - - - 47 - code - - Charging fees for transactions - - - 49 - code - - Cancellation or correction - - - 99 - code - - Cancellation or correction - - - - diff --git a/addons/l10n_be_coda/l10n_be_coda_trans_type.xml b/addons/l10n_be_coda/l10n_be_coda_trans_type.xml deleted file mode 100644 index 9be29ce622a..00000000000 --- a/addons/l10n_be_coda/l10n_be_coda_trans_type.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - 0 - Simple amount without detailed data; e.g. : an individual credit transfer (free of charges). - - - 1 - Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following (type 5). - - - 5 - - Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record (type 1). - - - 2 - Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data (type 6 or 7) is following. - - - 6 - - Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6. - - - 7 - - Detail of 2. Simple account with detailed data The records in a separate application keep type 7. - - - 9 - - Detail of 7. The records in a separate application keep type 9. - - - 3 - Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers. - - - 8 - - Detail of 3. - - - - diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 1ef09862c3d..9a362cd6fc4 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -1,547 +1,6 @@ - - - - - - - - coda.bank.account.search - coda.bank.account - - - - - - - - - - - - - - - - - - - coda.bank.account.list - coda.bank.account - - - - - - - - - - - - - coda.bank.account.form - coda.bank.account - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - CODA Bank Account Configuration - coda.bank.account - form - tree,form - - - - - - - account.coda.trans.type.tree - account.coda.trans.type - - - - - - - - - - account.coda.trans.type.form - account.coda.trans.type - -
- - - - - -
- - - - CODA Transaction Types - ir.actions.act_window - account.coda.trans.type - form - tree,form - - - - - - account.coda.trans.code.tree - account.coda.trans.code - - - - - - - - - - - account.coda.trans.code.form - account.coda.trans.code - -
- - - - - - - - -
- - - CODA Transaction Codes - ir.actions.act_window - account.coda.trans.code - form - tree,form - - - - - - account.coda.trans.category.tree - account.coda.trans.category - - - - - - - - - account.coda.trans.category.form - account.coda.trans.category - -
- - - - -
- - CODA Transaction Categories - ir.actions.act_window - account.coda.trans.category - form - tree,form - - - - - - account.coda.comm.type.tree - account.coda.comm.type - - - - - - - - - account.coda.comm.type.form - account.coda.comm.type - -
- - - - -
- - CODA Structured Communication Types - ir.actions.act_window - account.coda.comm.type - form - tree,form - - - - - - - - - - account.coda.tree - account.coda - - - - - - - - - - - - - account.coda.form - account.coda - -
- - - - - - - - - - - - - -
- - - - - account.coda.search - account.coda - - - - - - - - - - - - - - - - - Imported CODA Files - ir.actions.act_window - account.coda - form - tree,form - - - - - - - - - coda.bank.statement.list - coda.bank.statement - - - - - - - - - - - - - - - - - coda.bank.statement.form - coda.bank.statement - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - coda.bank.statement.search - coda.bank.statement - - - - - - - - - - - - - - - - - - - - - CODA Bank Statements - ir.actions.act_window - coda.bank.statement - form - tree,form - - - The CODA Bank Statements contain the information encoded in their originating CODA file in a human readable format. The Bank Statements associated with a CODA contain the subset of the CODA Bank Statement data that is required for the creation of the Accounting Entries. - - - - - - - - coda.bank.statement.line.list - coda.bank.statement.line - - - - - - - - - - - - - - - - - - - - - coda.bank.statement.line.form - coda.bank.statement.line - -
- - - - - - - - - - - - - - - - - - -
- - - coda.bank.statement.line.filter - coda.bank.statement.line - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CODA Statement Lines - coda.bank.statement.line - form - tree,form - {'block_statement_line_delete' : 1} - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/addons/l10n_be_coda/l10n_be_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml index 76178820d9c..427e0c1991e 100644 --- a/addons/l10n_be_coda/l10n_be_coda_wizard.xml +++ b/addons/l10n_be_coda/l10n_be_coda_wizard.xml @@ -49,20 +49,6 @@ new - - - - diff --git a/addons/l10n_be_coda/res_bank.py b/addons/l10n_be_coda/res_bank.py deleted file mode 100755 index 47e7fdf8569..00000000000 --- a/addons/l10n_be_coda/res_bank.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# -# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import fields, osv - - -class res_bank(osv.osv): - _inherit = 'res.bank' - _columns = { - 'code': fields.char('Code', size=3, - help='Country specific Bank Code (used for bban to iban conversion).'), - } -res_bank() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/res_bank_view.xml b/addons/l10n_be_coda/res_bank_view.xml deleted file mode 100755 index fe4a71d2bdb..00000000000 --- a/addons/l10n_be_coda/res_bank_view.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - res.bank.form.add.code - res.bank - - form - - - - - - - - - res.bank.tree.add.code - res.bank - - form - - - - - - - - - - diff --git a/addons/l10n_be_coda/security/account_security.xml b/addons/l10n_be_coda/security/account_security.xml deleted file mode 100644 index b8fdd32ebe6..00000000000 --- a/addons/l10n_be_coda/security/account_security.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Account Coda model company rule - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - diff --git a/addons/l10n_be_coda/security/ir.model.access.csv b/addons/l10n_be_coda/security/ir.model.access.csv deleted file mode 100644 index 89ee65048fb..00000000000 --- a/addons/l10n_be_coda/security/ir.model.access.csv +++ /dev/null @@ -1,17 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_account_coda_manager,account.coda manager,model_account_coda,account.group_account_manager,1,1,1,1 -access_account_coda_user,account.coda user,model_account_coda,account.group_account_user,1,0,0,0 -access_account_coda_trans_type_manager,account.coda.trans.type manager,model_account_coda_trans_type,account.group_account_manager,1,1,1,1 -access_account_coda_trans_type_user,account.coda.trans.type user,model_account_coda_trans_type,account.group_account_user,1,0,0,0 -access_account_coda_trans_code_manager,account.coda.trans.code manager,model_account_coda_trans_code,account.group_account_manager,1,1,1,1 -access_account_coda_trans_code_user,account.coda.trans.code user,model_account_coda_trans_code,account.group_account_user,1,0,0,0 -access_account_coda_trans_category_manager,account.coda.trans.category manager,model_account_coda_trans_category,account.group_account_manager,1,1,1,1 -access_account_coda_trans_category_user,account.coda.trans.category user,model_account_coda_trans_category,account.group_account_user,1,0,0,0 -access_account_coda_comm_type_manager,account.coda.comm.type manager,model_account_coda_comm_type,account.group_account_manager,1,1,1,1 -access_account_coda_comm_type_user,account.coda.comm.type user,model_account_coda_comm_type,account.group_account_user,1,0,0,0 -access_coda_bank_account_manager,coda.bank.account manager,model_coda_bank_account,account.group_account_manager,1,1,1,1 -access_coda_bank_account_user,coda.bank.account user,model_coda_bank_account,account.group_account_user,1,0,0,0 -access_coda_bank_statement_manager,coda.bank.statement manager,model_coda_bank_statement,account.group_account_manager,1,1,1,1 -access_coda_bank_statement_user,coda.bank.statement user,model_coda_bank_statement,account.group_account_user,1,0,0,0 -access_coda_bank_statement_line_manager,coda.bank.statement.line manager,model_coda_bank_statement_line,account.group_account_manager,1,1,1,1 -access_coda_bank_statement_line_user,coda.bank.statement.line user,model_coda_bank_statement_line,account.group_account_user,1,0,0,0 diff --git a/addons/l10n_be_coda/wizard/__init__.py b/addons/l10n_be_coda/wizard/__init__.py index 3851606707b..e3038609b80 100644 --- a/addons/l10n_be_coda/wizard/__init__.py +++ b/addons/l10n_be_coda/wizard/__init__.py @@ -20,6 +20,6 @@ # ############################################################################## -import account_coda_import_dle +import account_coda_import # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index bb165cf1656..b63b29701d8 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -20,14 +20,11 @@ # ############################################################################## -import time import base64 from osv import fields, osv from tools.translate import _ -import netsvc -import re -from traceback import format_exception -from sys import exc_info +import time +import tools import logging _logger = logging.getLogger(__name__) @@ -44,14 +41,11 @@ class account_coda_import(osv.osv_memory): 'coda_fname': lambda *a: '', } - def _check_account_payment(self, cr, uid, context=None): - res = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', 'account_payment'), ('state', '=', 'installed')]) - return res and True or False - def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None): if context is None: context = {} if batch: + print codafile = str(codafile) codafilename = codafilename else: @@ -62,1866 +56,685 @@ class account_coda_import(osv.osv_memory): except: raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) return {} - - currency_obj = self.pool.get('res.currency') - coda_bank_account_obj = self.pool.get('coda.bank.account') - trans_type_obj = self.pool.get('account.coda.trans.type') - trans_code_obj = self.pool.get('account.coda.trans.code') - trans_category_obj = self.pool.get('account.coda.trans.category') - comm_type_obj = self.pool.get('account.coda.comm.type') - journal_obj = self.pool.get('account.journal') - period_obj = self.pool.get('account.period') - partner_bank_obj = self.pool.get('res.partner.bank') - coda_obj = self.pool.get('account.coda') - coda_st_obj = self.pool.get('coda.bank.statement') - coda_st_line_obj = self.pool.get('coda.bank.statement.line') - bank_st_obj = self.pool.get('account.bank.statement') - bank_st_line_obj = self.pool.get('account.bank.statement.line') - glob_obj = self.pool.get('account.bank.statement.line.global') - inv_obj = self.pool.get('account.invoice') - move_line_obj = self.pool.get('account.move.line') - voucher_obj = self.pool.get('account.voucher') - seq_obj = self.pool.get('ir.sequence') - mod_obj = self.pool.get('ir.model.data') - account_mapping_obj = self.pool.get('coda.account.mapping.rule') - - if self._check_account_payment(cr, uid): - payment_line_obj = self.pool.get('payment.line') - else: - payment_line_obj = False - - wf_service = netsvc.LocalService('workflow') - - coda_bank_table = coda_bank_account_obj.read(cr, uid, coda_bank_account_obj.search(cr, uid, []), context=context) - for coda_bank in coda_bank_table: - coda_bank.update({'journal_code': coda_bank['journal'] and journal_obj.browse(cr, uid, coda_bank['journal'][0], context=context).code or ''}) - coda_bank.update({'iban': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).iban}) - coda_bank.update({'acc_number': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).acc_number}) - coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name}) - trans_type_table = trans_type_obj.read(cr, uid, trans_type_obj.search(cr, uid, []), context=context) - trans_code_table = trans_code_obj.read(cr, uid, trans_code_obj.search(cr, uid, []), context=context) - trans_category_table = trans_category_obj.read(cr, uid, trans_category_obj.search(cr, uid, []), context=context) - comm_type_table = comm_type_obj.read(cr, uid, comm_type_obj.search(cr, uid, []), context=context) - - err_string = '' - err_code = None - err_log = '' - coda_statements = [] recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') - digits = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - + statements = [] for line in recordlist: - if not line: pass elif line[0] == '0': - # start of a new statement within the CODA file - coda_statement = {} - coda_parsing_note = '' - coda_statement_lines = {} - st_line_seq = 0 - # header data - coda_statement['currency'] = 'EUR' # default currency - coda_statement['version'] = line[127] - coda_version = line[127] - if coda_version not in ['1', '2']: - err_string = _('\nCODA V%s statements are not supported, please contact your bank!') % coda_version - err_code = 'R0001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - coda_statement['coda_statement_lines'] = {} - coda_statement['date'] = str2date(line[5:11]) - coda_statement['coda_creation_date'] = str2date(line[5:11]) - coda_statement['separate_application'] = line[83:88] - coda_statement['first_transaction_date'] = False - coda_statement['state'] = 'draft' - - coda_id = coda_obj.search(cr, uid, [ - ('name', '=', codafilename), - ('coda_creation_date', '=', coda_statement['date']), - ]) - if coda_id: - err_string = _("\nCODA File with Filename '%s' and Creation Date '%s' has already been imported !") \ - % (codafilename, coda_statement['date']) - err_code = 'W0001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Warning !'), err_string) - + #Begin of a new Bank statement + statement = {} + statements.append(statement) + statement['version'] = line[127] + if statement['version'] not in ['1', '2']: + raise osv.except_osv(_('Error R001!'), _('CODA V%s statements are not supported, please contact your bank!') % statement['version']) + statement['globalisation_stack'] = [] + statement['lines'] = [] + statement['date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[5:11]), '%d%m%y')) + statement['separateApplication'] = rmspaces(line[83:88]) elif line[0] == '1': - if coda_version == '1': - coda_statement['acc_number'] = line[5:17] - if line[18:21].strip(): - coda_statement['currency'] = line[18:21] - elif line[1] == '0': # Belgian bank account BBAN structure - coda_statement['acc_number'] = line[5:17] - coda_statement['currency'] = line[18:21] - elif line[1] == '1': # foreign bank account BBAN structure - err_string = _('\nForeign bank accounts with BBAN structure are not supported !') - err_code = 'R1001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - elif line[1] == '2': # Belgian bank account IBAN structure - coda_statement['acc_number'] = line[5:21] - coda_statement['currency'] = line[39:42] - elif line[1] == '3': # foreign bank account IBAN structure - err_string = _('\nForeign bank accounts with IBAN structure are not supported !') - err_code = 'R1002' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - else: - err_string = _('\nUnsupported bank account structure !') - err_code = 'R1003' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - coda_statement['description'] = line[90:125].strip() - cba_filter = lambda x: (coda_statement['acc_number'] in _get_acc_numbers(x['acc_number'])) \ - and (coda_statement['currency'] == x['currency_name']) and (coda_statement['description'] in [x['description1'] or '', x['description2'] or '']) - coda_bank = filter(cba_filter, coda_bank_table) - if coda_bank: - coda_bank = coda_bank[0] - coda_statement['type'] = coda_bank['state'] - coda_statement['journal_id'] = coda_bank['journal'] and coda_bank['journal'][0] - coda_statement['currency_id'] = coda_bank['currency'][0] - coda_statement['coda_bank_account_id'] = coda_bank['id'] - coda_statement['account_mapping_ids'] = coda_bank['account_mapping_ids'] - coda_statement['coda_bank_params'] = coda_bank - awaiting_acc = coda_bank['awaiting_account'][0] - transfer_acc = coda_bank['transfer_account'][0] - find_payment = coda_bank['find_payment'] - find_bbacom = coda_bank['find_bbacom'] - find_inv_number = coda_bank['find_inv_number'] - find_partner = coda_bank['find_partner'] - update_partner = coda_bank['update_partner'] - coda_statement['balance_start_enforce'] = coda_bank['balance_start_enforce'] - coda_statement['discard_dup'] = coda_bank['discard_dup'] - company_id = coda_bank['company_id'][0] - company_bank_ids = partner_bank_obj.search(cr, uid, [('company_id', '=', company_id)]) - company_bank_accounts = partner_bank_obj.read(cr, uid, company_bank_ids, ['acc_number']) - company_bank_accounts = [x['acc_number'].replace(' ', '') for x in company_bank_accounts] - else: - err_string = _("\nNo matching CODA Bank Account Configuration record found !") + \ - _("\nPlease check if the 'Bank Account Number', 'Currency' and 'Account Description' fields of your configuration record match with '%s', '%s' and '%s' !") \ - % (coda_statement['acc_number'], coda_statement['currency'], coda_statement['description']) - err_code = 'R1004' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - bal_start = list2float(line[43:58]) # old balance data - if line[42] == '1': # 1= Debit - bal_start = - bal_start - coda_statement['balance_start'] = bal_start - coda_statement['old_balance_date'] = str2date(line[58:64]) - coda_statement['acc_holder'] = line[64:90] - coda_statement['paper_ob_seq_number'] = line[2:5] - coda_statement['coda_seq_number'] = line[125:128] - + #Statement details + if statement['version'] == '1': + statement['accountNumber'] = rmspaces(line[5:17]) + statement['currency'] = rmspaces(line[18:21]) + elif statement['version'] == '2': + if line[1] == '0': # Belgian bank account BBAN structure + statement['accountNumber'] = rmspaces(line[5:17]) + statement['currency'] = rmspaces(line[18:21]) + elif line[1] == '1': # foreign bank account BBAN structure + raise osv.except_osv(_('Error R1001!'), _('Foreign bank accounts with BBAN structure are not supported !')) + elif line[1] == '2': # Belgian bank account IBAN structure + statement['accountNumber'] = rmspaces(line[5:21]) + statement['currency'] = rmspaces(line[39:42]) + elif line[1] == '3': # foreign bank account IBAN structure + raise osv.except_osv(_('Error R1002!'), _('Foreign bank accounts with IBAN structure are not supported !')) + else: # Something else, not supported + raise osv.except_osv(_('Error R1003!'), _('Unsupported bank account structure !')) + statement['description'] = rmspaces(line[90:125]) + statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 + statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) + statement['accountHolder'] = rmspaces(line[64:90]) + statement['paperSeqNumber'] = rmspaces(line[2:5]) + statement['codaSeqNumber'] = rmspaces(line[125:128]) elif line[0] == '2': - # movement data record 2 - if line[1] == '1': - # movement data record 2.1 - st_line = {} - st_line_seq = st_line_seq + 1 - st_line['sequence'] = st_line_seq - st_line['type'] = 'general' - st_line['reconcile'] = False - st_line['trans_family'] = False - st_line['struct_comm_type'] = '' - st_line['struct_comm_type_id'] = 0 - st_line['struct_comm_type_desc'] = '' - st_line['struct_comm_bba'] = '' - st_line['communication'] = '' - st_line['payment_reference'] = '' - st_line['partner_id'] = 0 - st_line['account_id'] = 0 - st_line['counterparty_name'] = '' - st_line['counterparty_bic'] = '' - st_line['counterparty_number'] = '' - st_line['counterparty_currency'] = '' - st_line['glob_lvl_flag'] = False - st_line['globalisation_id'] = 0 - st_line['globalisation_code'] = '' - st_line['globalisation_amount'] = False - st_line['amount'] = False - - st_line['ref'] = line[2:10] - st_line['ref_move'] = line[2:6] - st_line['ref_move_detail'] = line[6:10] - - if st_line_seq == 1: - main_move_stack = [st_line] # initialise main_move_stack (used to link 2.1 detail records to 2.1 main record - glob_lvl_stack = [0] # initialise globalisation stack - elif st_line['ref_move_detail'] == '0000': - glob_lvl_stack = [0] # re-initialise globalisation stack - - st_line['trans_ref'] = line[10:31] - st_line_amt = list2float(line[32:47]) - if line[31] == '1': # 1=debit - st_line_amt = - st_line_amt - - st_line['trans_type'] = line[53] - trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table) - if not trans_type: - err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type'] - err_code = 'R2001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - st_line['trans_type_id'] = trans_type[0]['id'] - st_line['trans_type_desc'] = trans_type[0]['description'] - - # processing of amount depending on globalisation code - glob_lvl_flag = int(line[124]) - if glob_lvl_flag > 0: - if glob_lvl_stack[-1] == glob_lvl_flag: - st_line['glob_lvl_flag'] = glob_lvl_flag - st_line['amount'] = st_line_amt - glob_lvl_stack.pop() + #New statement line + statementLine = {} + statementLine['type'] = 'general' + statementLine['ref'] = rmspaces(line[2:10]) + statementLine['ref_move'] = rmspaces(line[2:6]) + statementLine['ref_move_detail'] = rmspaces(line[6:10]) + statementLine['sequence'] = len(statement['lines']) + 1 + statementLine['transactionRef'] = rmspaces(line[10:31]) + statementLine['debit'] = line[31] # 0 = Credit, 1 = Debit + statementLine['amount'] = float(rmspaces(line[32:47])) / 1000 + if statementLine['debit'] == '1': + statementLine['amount'] = - statementLine['amount'] + statementLine['transaction_type'] = line[53] + if statementLine['transaction_type'] not in transaction_types: + raise osv.except_osv(_('Error R2001!'), _('The File contains an invalid CODA Transaction Type : %s!') % statementLine['transaction_type']) + statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) + statementLine['transaction_family'] = rmspaces(line[54:56]) + #TODO Handling severals transactions Family + statementLine['transaction_code'] = rmspaces(line[56:58]) + #TODO Handling severals transactions code + statementLine['transaction_category'] = rmspaces(line[58:61]) + #TODO Handling severals transactions category + statementLine['communication'] = rmspaces(line[62:115]) + #TODO Handling structured communication + statementLine['entryDate'] = rmspaces(line[115:121]) + statementLine['type'] = 'normal' + statementLine['globalisation'] = int(line[124]) + if len(statement['globalisation_stack']) > 0 and statementLine['communication'] != '': + statementLine['communication'] = "\n".join([statement['globalisation_stack'][-1]['communication'], statementLine['communication']]) + if statementLine['globalisation'] > 0: + if len(statement['globalisation_stack']) > 0 and statement['globalisation_stack'][-1]['globalisation'] == statementLine['globalisation']: + # Destack + statement['globalisation_stack'].pop() else: - glob_lvl_stack.append(glob_lvl_flag) - st_line['type'] = 'globalisation' - st_line['glob_lvl_flag'] = glob_lvl_flag - st_line['globalisation_amount'] = st_line_amt - else: - st_line['amount'] = st_line_amt - - # The 'globalisation' concept can also be implemented without the globalisation level flag. - # This is e.g. used by Europabank to give the details of Card Payments. - if st_line['ref_move'] == main_move_stack[-1]['ref_move']: - if st_line['ref_move_detail'] == '9999': - # Current CODA parsing logic doesn't support > 9999 detail lines - err_string = _('\nTransaction Detail Limit reached!') - err_code = 'R2010' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - elif st_line['ref_move_detail'] != '0000': - if glob_lvl_stack[-1] == 0: - # promote associated move record into a globalisation - glob_lvl_flag = 1 - glob_lvl_stack.append(glob_lvl_flag) - main_st_line_seq = main_move_stack[-1]['sequence'] - to_promote = coda_statement['coda_statement_lines'][main_st_line_seq] - if not main_move_stack[-1].get('detail_cnt'): - to_promote.update({ - 'type': 'globalisation', - 'glob_lvl_flag': glob_lvl_flag, - 'globalisation_amount': main_move_stack[-1]['amount'], - 'amount': False, - 'account_id': 0, - }) - main_move_stack[-1]['promoted'] = True - if not main_move_stack[-1].get('detail_cnt'): - main_move_stack[-1]['detail_cnt'] = 1 - else: - main_move_stack[-1]['detail_cnt'] += 1 - - # positions 48-53 : Valuta date or 000000 if not known (DDMMYY) - st_line['val_date'] = str2date(line[47:53]) - # positions 54-61 : transaction code - st_line['trans_family'] = line[54:56] - trans_family = filter(lambda x: (x['type'] == 'family') and (st_line['trans_family'] == x['code']), trans_code_table) - if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] - err_code = 'R2002' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - st_line['trans_family_id'] = trans_family[0]['id'] - st_line['trans_family_desc'] = trans_family[0]['description'] - st_line['trans_code'] = line[56:58] - trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), - trans_code_table) - if trans_code: - st_line['trans_code_id'] = trans_code[0]['id'] - st_line['trans_code_desc'] = trans_code[0]['description'] - else: - st_line['trans_code_id'] = None - st_line['trans_code_desc'] = _('Transaction Code unknown, please consult your bank.') - st_line['trans_category'] = line[58:61] - trans_category = filter(lambda x: st_line['trans_category'] == x['category'], trans_category_table) - if trans_category: - st_line['trans_category_id'] = trans_category[0]['id'] - st_line['trans_category_desc'] = trans_category[0]['description'] - else: - st_line['trans_category_id'] = None - st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 61-115 : communication - if line[61] == '1': - st_line['struct_comm_type'] = line[62:65] - comm_type = filter(lambda x: st_line['struct_comm_type'] == x['code'], comm_type_table) - if not comm_type: - err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % st_line['struct_comm_type'] - err_code = 'R2003' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - st_line['struct_comm_type_id'] = comm_type[0]['id'] - st_line['struct_comm_type_desc'] = comm_type[0]['description'] - st_line['communication'] = st_line['name'] = line[65:115] - if st_line['struct_comm_type'] in ['101', '102']: - bbacomm = line[65:77] - st_line['struct_comm_bba'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++' - else: - st_line['communication'] = st_line['name'] = line[62:115] - st_line['entry_date'] = str2date(line[115:121]) - if st_line['sequence'] == 1: - coda_statement['first_transaction_date'] = st_line['entry_date'] - # positions 122-124 not processed - coda_statement_lines[st_line_seq] = st_line # store transaction - - if st_line['ref_move'] != main_move_stack[-1]['ref_move']: - if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): - # add closing globalisation level on previous detail record in order to correctly close - # moves that have been 'promoted' to globalisation - closeglobalise = coda_statement['coda_statement_lines'][st_line_seq - 1] - closeglobalise.update({ - 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], - }) - else: - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - # the same logic is repeated on the New Balance Record ('8 Record') in order to cope with CODA files - # containing a single 2.1 record that needs to be 'demoted'. - if main_move_stack[-1]['type'] == 'globalisation' and not main_move_stack[-1].get('detail_cnt'): - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - main_st_line_seq = main_move_stack[-1]['sequence'] - to_demote = coda_statement['coda_statement_lines'][main_st_line_seq] - to_demote.update({ - 'type': 'general', - 'glob_lvl_flag': 0, - 'globalisation_amount': False, - 'amount': main_move_stack[-1]['globalisation_amount'], - }) - main_move_stack.pop() - main_move_stack.append(st_line) - coda_statement['coda_statement_lines'] = coda_statement_lines - + #Stack + statementLine['type'] = 'globalisation' + statement['globalisation_stack'].append(statementLine) + statement['lines'].append(statementLine) elif line[1] == '2': - # movement data record 2.2 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: - err_string = _('\nCODA parsing error on movement data record 2.2, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R2004' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:63] - coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:63] - coda_statement['coda_statement_lines'][st_line_seq]['payment_reference'] = line[63:98].strip() - coda_statement['coda_statement_lines'][st_line_seq]['counterparty_bic'] = line[98:109].strip() - + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + raise osv.except_osv(_('Error R2004!'), _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:63]) + statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) + statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) elif line[1] == '3': - # movement data record 2.3 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'][0:4] != line[2:6]: - err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R2005' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - st_line = coda_statement_lines[st_line_seq] - if coda_version == '1': - counterparty_number = line[10:22].strip() - counterparty_name = line[47:125].strip() - counterparty_currency = '' + if statement['lines'][-1]['ref'][0:4] != line[2:6]: + raise osv.except_osv(_('Error R2005!'), _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + if statement['version'] == '1': + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) + statement['lines'][-1]['counterpartyCurrency'] = '' else: if line[22] == ' ': - counterparty_number = line[10:22].strip() - counterparty_currency = line[23:26].strip() + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[23:26]) else: - counterparty_number = line[10:44].strip() - counterparty_currency = line[44:47].strip() - counterparty_name = line[47:82].strip() - st_line['name'] += line[82:125] - st_line['communication'] += line[82:125] - st_line['counterparty_number'] = counterparty_number - st_line['counterparty_currency'] = counterparty_currency - st_line['counterparty_name'] = counterparty_name - """ - TO DO: - - replace code infra by check on flag 128 and copy info in Notes Field. - - if counterparty_currency not in [coda_bank['currency_name'], '']: - err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R2006' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - """ - - # invoice matching and reconciliation - if st_line['type'] == 'general': - match = False - payment_reference_match = False - inv_ids = None - partner_bank_ids = False - - # check payment reference in bank statement line against payment order lines - payment_reference = st_line['payment_reference'] - if payment_reference and find_payment and st_line['amount'] < 0: - payline_ids = payment_line_obj and payment_line_obj.search(cr, uid, [('name', '=', payment_reference)]) - if payline_ids: - if len(payline_ids) == 1: - payline = payment_line_obj.browse(cr, uid, payline_ids[0]) - match = True - payment_reference_match = True - st_line['partner_id'] = payline.partner_id.id - if payline.move_line_id: - st_line['reconcile'] = payline.move_line_id.id - st_line['account_id'] = payline.move_line_id.account_id.id - if payline._get_ml_inv_ref: - inv_type = payline.ml_inv_ref.type - st_line['type'] = inv_type == 'in_invoice' and 'supplier' or 'customer' - else: - st_line['type'] = 'general' - else: - err_string = _('\nThe CODA parsing detected a payment reference ambiguity while processing movement data record 2.3, seq nr %s!' \ - '\nPlease check your Payment Gateway configuration or contact your OpenERP support channel.') % line[2:10] - err_code = 'R2007' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - - # check bba scor in bank statement line against open invoices - if st_line['struct_comm_bba'] and find_bbacom: - if st_line['amount'] > 0: - domain = [('type', 'in', ['out_invoice', 'in_refund'])] - else: - domain = [('type', 'in', ['in_invoice', 'out_refund'])] - inv_ids = inv_obj.search(cr, uid, - domain + [('state', '=', 'open'), ('reference', '=', st_line['struct_comm_bba']), ('reference_type', '=', 'bba')]) - if not inv_ids: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n There is no invoice matching the Structured Communication '%s'!" \ - "\n Please verify and adjust the invoice and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (st_line['ref'], st_line['struct_comm_bba']) - elif len(inv_ids) == 1: - match = True - elif len(inv_ids) > 1: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n There are multiple invoices matching the Structured Communication '%s'!" \ - "\n A manual reconciliation is required.") \ - % (st_line['ref'], st_line['struct_comm_bba']) - - # use free comm in bank statement line for lookup against open invoices - if not match and find_bbacom: - # extract possible bba scor from free form communication and try to find matching invoice - free_comm_digits = re.sub('\D', '', st_line['communication'] or '') - select = "SELECT id FROM (SELECT id, type, state, amount_total, number, reference_type, reference, " \ - "'%s'::text AS free_comm_digits FROM account_invoice) sq " \ - "WHERE state = 'open' AND reference_type = 'bba' " \ - "AND free_comm_digits LIKE '%%'||regexp_replace(reference, '\\\D', '', 'g')||'%%'" \ - % (free_comm_digits) - if st_line['amount'] > 0: - select2 = " AND type IN ('out_invoice', 'in_refund')" - else: - select2 = " AND type IN ('in_invoice', 'out_refund')" - cr.execute(select + select2) - res = cr.fetchall() - if res: - inv_ids = [x[0] for x in res] - if len(inv_ids) == 1: - match = True - if not match and st_line['communication'] and find_inv_number: - # check matching invoice number in free form communication combined with matching amount - free_comm = repl_special(st_line['communication'].strip()) - amount_fmt = '%.' + str(digits) + 'f' - if st_line['amount'] > 0: - amount_rounded = amount_fmt % round(st_line['amount'], digits) - else: - amount_rounded = amount_fmt % round(-st_line['amount'], digits) - select = "SELECT id FROM (SELECT id, type, state, amount_total, number, reference_type, reference, " \ - "'%s'::text AS free_comm FROM account_invoice) sq " \ - "WHERE state = 'open' AND amount_total = %s" \ - % (free_comm, amount_rounded) - # 'out_invoice', 'in_refund' - if st_line['amount'] > 0: - select2 = " AND type = 'out_invoice' AND free_comm ilike '%'||number||'%'" - cr.execute(select + select2) - res = cr.fetchall() - if res: - inv_ids = [x[0] for x in res] - else: - select2 = " AND type = 'in_refund' AND free_comm ilike '%'||reference||'%'" - cr.execute(select + select2) - res = cr.fetchall() - if res: - inv_ids = [x[0] for x in res] - # 'in_invoice', 'out_refund' - else: - select2 = " AND type = 'in_invoice' AND free_comm ilike '%'||reference||'%'" - cr.execute(select + select2) - res = cr.fetchall() - if res: - inv_ids = [x[0] for x in res] - else: - select2 = " AND type = 'out_refund' AND free_comm ilike '%'||number||'%'" - cr.execute(select + select2) - res = cr.fetchall() - if res: - inv_ids = [x[0] for x in res] - if inv_ids: - if len(inv_ids) == 1: - match = True - elif len(inv_ids) > 1: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n There are multiple invoices matching the Invoice Amount and Reference." \ - "\n A manual reconciliation is required.") \ - % (st_line['ref']) - - if not payment_reference_match and match and inv_ids and len(inv_ids) == 1: - invoice = inv_obj.browse(cr, uid, inv_ids[0]) - partner = invoice.partner_id - st_line['partner_id'] = partner.id - if invoice.type in ['in_invoice', 'in_refund']: - st_line['account_id'] = partner.property_account_payable.id - st_line['type'] = 'supplier' - else: - st_line['account_id'] = partner.property_account_receivable.id - st_line['type'] = 'customer' - iml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)]) - if iml_ids: - st_line['reconcile'] = iml_ids[0] - else: - err_string = _('\nThe CODA parsing detected a database inconsistency while processing movement data record 2.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R2008' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - - # lookup partner via counterparty_number when invoice lookup failed - if not match and counterparty_number: - transfer_account = filter(lambda x: counterparty_number in x, company_bank_accounts) - if transfer_account: - st_line['account_id'] = transfer_acc - match = True - elif find_partner: - partner_bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', counterparty_number)]) - if not match and find_partner and partner_bank_ids: - if len(partner_bank_ids) > 1: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'!" \ - "\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (st_line['ref'], counterparty_number) - else: - partner_bank = partner_bank_obj.browse(cr, uid, partner_bank_ids[0], context) - st_line['partner_id'] = partner_bank.partner_id.id - match = True - if st_line['amount'] < 0: - st_line['account_id'] = partner_bank.partner_id.property_account_payable.id - st_line['type'] = 'supplier' - else: - st_line['account_id'] = partner_bank.partner_id.property_account_receivable.id - st_line['type'] = 'customer' - elif not match and find_partner: - if counterparty_number: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n The bank account '%s' is not defined for the partner '%s'!" \ - "\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \ - % (st_line['ref'], counterparty_number, counterparty_name) - else: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':" \ - "\n No matching partner record found!" \ - "\n Please adjust the corresponding entry manually in the generated Bank Statement.") \ - % (st_line['ref']) - st_line['account_id'] = awaiting_acc - - # add bank account to partner record - if match and st_line['account_id'] != transfer_acc and counterparty_number and update_partner: - partner_bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', counterparty_number), ('partner_id', '=', st_line['partner_id'])], order='id') - if len(partner_bank_ids) > 1: - # clean up partner bank duplicates, keep most recently created - _logger.warn('Duplicate Bank Accounts for partner_id %s have been removed, ids = %s', - st_line['partner_id'], partner_bank_ids[:-1]) - partner_bank_obj.unlink(cr, uid, partner_bank_ids[:-1]) - if not partner_bank_ids: - feedback = update_partner_bank(self, cr, uid, st_line['counterparty_bic'], counterparty_number, st_line['partner_id'], counterparty_name) - if feedback: - coda_parsing_note += _("\n Bank Statement '%%(name)s' line '%s':") % st_line['ref'] + feedback - - coda_statement_lines[st_line_seq] = st_line - coda_statement['coda_statement_lines'] = coda_statement_lines - # end of processing movement data record 2.3 - + statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:44]) + statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[44:47]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:82]) + statement['lines'][-1]['communication'] += rmspaces(line[82:125]) else: - # movement data record 2.x (x <> 1,2,3) - err_string = _('\nMovement data records of type 2.%s are not supported !') % line[1] - err_code = 'R2009' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - + # movement data record 2.x (x != 1,2,3) + raise osv.except_osv(_('Error R2009!'), _('\nMovement data records of type 2.%s are not supported !') % line[1]) elif line[0] == '3': - # information data record 3 - if line[1] == '1': - # information data record 3.1 - info_line = {} - info_line['entry_date'] = st_line['entry_date'] - info_line['type'] = 'information' - st_line_seq = st_line_seq + 1 - info_line['sequence'] = st_line_seq - info_line['struct_comm_type'] = '' - info_line['struct_comm_type_desc'] = '' - info_line['communication'] = '' - info_line['ref'] = line[2:10] - info_line['trans_ref'] = line[10:31] - # positions 32-38 : transaction code - info_line['trans_type'] = line[31] - trans_type = filter(lambda x: info_line['trans_type'] == x['type'], trans_type_table) - if not trans_type: - err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type'] - err_code = 'R3001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - info_line['trans_type_desc'] = trans_type[0]['description'] - info_line['trans_family'] = line[32:34] - trans_family = filter(lambda x: (x['type'] == 'family') and (info_line['trans_family'] == x['code']), trans_code_table) - if not trans_family: - err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family'] - err_code = 'R3002' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - info_line['trans_family_desc'] = trans_family[0]['description'] - info_line['trans_code'] = line[34:36] - trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]), - trans_code_table) - if trans_code: - info_line['trans_code_desc'] = trans_code[0]['description'] - else: - info_line['trans_code_desc'] = _('Transaction Code unknown, please consult your bank.') - info_line['trans_category'] = line[36:39] - trans_category = filter(lambda x: info_line['trans_category'] == x['category'], trans_category_table) - if trans_category: - info_line['trans_category_desc'] = trans_category[0]['description'] - else: - info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.') - # positions 40-113 : communication - if line[39] == '1': - info_line['struct_comm_type'] = line[40:43] - comm_type = filter(lambda x: info_line['struct_comm_type'] == x['code'], comm_type_table) - if not comm_type: - err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % info_line['struct_comm_type'] - err_code = 'R3003' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - info_line['struct_comm_type_desc'] = comm_type[0]['description'] - info_line['communication'] = info_line['name'] = line[43:113] - else: - info_line['communication'] = info_line['name'] = line[40:113] - # positions 114-128 not processed - coda_statement_lines[st_line_seq] = info_line - coda_statement['coda_statement_lines'] = coda_statement_lines - + infoLine = {} + infoLine['entryDate'] = statement['lines'][-1]['entryDate'] + infoLine['type'] = 'information' + infoLine['sequence'] = len(statement['lines']) + 1 + infoLine['ref'] = rmspaces(line[2:10]) + infoLine['transactionRef'] = rmspaces(line[10:31]) + infoLine['transaction_type'] = line[31] + infoLine['transaction_family'] = rmspaces(line[32:34]) + infoLine['transaction_code'] = rmspaces(line[34:36]) + infoLine['transaction_category'] = rmspaces(line[36:39]) + infoLine['communication'] = rmspaces(line[40:113]) + infoLine['amount'] = 0.0 + infoLine['type'] = 'information' + statement['lines'].append(infoLine) elif line[1] == '2': - # information data record 3.2 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on information data record 3.2, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R3004' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115] - coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:115] - + if infoLine['ref'] != rmspaces(line[2:10]): + raise osv.except_osv(_('Error R3004!'), _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) elif line[1] == '3': - # information data record 3.3 - if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]: - err_string = _('\nCODA parsing error on information data record 3.3, seq nr %s!' \ - '\nPlease report this issue via your OpenERP support channel.') % line[2:10] - err_code = 'R3005' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Error!'), err_string) - coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:100] - coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:100] - + if infoLine['ref'] != rmspaces(line[2:10]): + raise osv.except_osv(_('Error R3005!'), _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + statement['lines'][-1]['communication'] += rmspaces(line[10:100]) elif line[0] == '4': - # free communication data record 4 - comm_line = {} - comm_line['type'] = 'communication' - st_line_seq = st_line_seq + 1 - comm_line['sequence'] = st_line_seq - comm_line['ref'] = line[2:10] - comm_line['communication'] = comm_line['name'] = line[32:112] - coda_statement_lines[st_line_seq] = comm_line - coda_statement['coda_statement_lines'] = coda_statement_lines - + comm_line = {} + comm_line['type'] = 'communication' + comm_line['sequence'] = len(statement['lines']) + 1 + comm_line['ref'] = rmspaces(line[2:10]) + comm_line['communication'] = rmspaces(line[32:112]) + comm_line['amount'] = 0.0 + comm_line['type'] = 'communication' + statement['lines'].append(comm_line) elif line[0] == '8': # new balance record - last_transaction = main_move_stack[-1] - if last_transaction['type'] == 'globalisation' and not last_transaction.get('detail_cnt'): - # demote record with globalisation code from 'globalisation' to 'general' when no detail records - main_st_line_seq = main_move_stack[-1]['sequence'] - to_demote = coda_statement['coda_statement_lines'][main_st_line_seq] - to_demote.update({ - 'type': 'general', - 'glob_lvl_flag': 0, - 'globalisation_amount': False, - 'amount': main_move_stack[-1]['globalisation_amount'], - }) - # add closing globalisation level on previous detail record in order to correctly close - # moves that have been 'promoted' to globalisation - if main_move_stack[-1].get('detail_cnt') and main_move_stack[-1].get('promoted'): - closeglobalise = coda_statement['coda_statement_lines'][st_line_seq - 1] - closeglobalise.update({ - 'glob_lvl_flag': main_move_stack[-1]['glob_lvl_flag'], - }) - coda_statement['paper_nb_seq_number'] = line[1:4] - bal_end = list2float(line[42:57]) - coda_statement['new_balance_date'] = str2date(line[57:63]) - if line[41] == '1': # 1=Debit - bal_end = - bal_end - coda_statement['balance_end_real'] = bal_end - if coda_statement['new_balance_date']: - period_id = period_obj.search(cr, uid, [('date_start', '<=', coda_statement['new_balance_date']), ('date_stop', '>=', coda_statement['new_balance_date'])]) + statement['debit'] = line[41] + statement['paperSeqNumber'] = rmspaces(line[1:4]) + statement['balance_end_real'] = float(rmspaces(line[42:57])) / 1000 + statement['balance_end_realDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[57:63]), '%d%m%y')) + if statement['debit'] == '1': # 1=Debit + statement['balance_end_real'] = - statement['balance_end_real'] + if statement['balance_end_realDate']: + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])]) else: - period_id = period_obj.search(cr, uid, [('date_start', '<=', coda_statement['date']), ('date_stop', '>=', coda_statement['date'])]) - if not period_id: - err_string = _("\nThe CODA Statement New Balance date doesn't fall within a defined Accounting Period!" \ - "\nPlease create the Accounting Period for date %s.") % coda_statement['new_balance_date'] - err_code = 'R0002' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('Data Error!'), err_string) - coda_statement['period_id'] = period_id[0] - if coda_bank['coda_st_naming']: - coda_statement['name'] = coda_bank['coda_st_naming'] % { - 'code': coda_bank['journal_code'] or '', - 'year': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][:4] or coda_statement['date'][:4], - 'y': coda_statement['new_balance_date'] and coda_statement['new_balance_date'][2:4] or coda_statement['date'][2:4], - 'coda': coda_statement['coda_seq_number'], - 'paper_ob': coda_statement['paper_ob_seq_number'], - 'paper': coda_statement['paper_nb_seq_number'], - } - else: - coda_statement['name'] = '/' - + period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) + if not period_id and len(period_id) == 0: + raise osv.except_osv(_('Error R0002!'), _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate']) + statement['period_id'] = period_id[0] elif line[0] == '9': - # footer record - coda_statement['balance_min'] = list2float(line[22:37]) - coda_statement['balance_plus'] = list2float(line[37:52]) - if not bal_end: - coda_statement['balance_end_real'] = coda_statement['balance_start'] + coda_statement['balance_plus'] - coda_statement['balance_min'] - if coda_parsing_note: - coda_statement['coda_parsing_note'] = '\nStatement Line matching results:' + coda_parsing_note - else: - coda_statement['coda_parsing_note'] = '' - coda_statements.append(coda_statement) - #end for + statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 + statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 + if not statement['balance_end_real']: + statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] + for i, statement in enumerate(statements): + # print '---STATEMENT #' + str(i) + '---' + print statement + data = { + 'name': '[' + statement['date'] + ']' + statement['description'], + 'date': statement['date'], + 'journal_id': 18, + 'period_id': statement['period_id'], + 'balance_start': statement['balance_start'], + 'balance_end_real': statement['balance_end_real'], + 'account_id': 1 + } + statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) + for line in statement['lines']: + if line['type'] == 'normal': + counterparty = [] + if 'counterpartyName' in line: + counterparty.append(line['counterpartyName']) + if 'counterpartyNumber' in line: + counterparty.append(line['counterpartyNumber']) + if len(counterparty) > 0: + counterparty = '[' + ' / '.join(counterparty) + ']' + else: + counterparty = '/' + if line['transaction_type'] in transaction_types: + line['transaction_type'] = transaction_types[line['transaction_type']][1] + if line['transaction_category'] in transaction_categories: + line['transaction_category'] = transaction_categories[line['transaction_category']] + if line['transaction_family'] in transaction_codes: + transaction_family = transaction_codes[line['transaction_family']] + line['transaction_family'] = transaction_family[0] + if line['transaction_code'] in transaction_family[1]: + line['transaction_code'] = transaction_family[1][line['transaction_code']] + note = [] + note.append(_('Counter Party') + ': ' + counterparty) + note.append(_('Communication') + ': ' + line['communication']) + note.append(_('Transaction type') + ': ' + line['transaction_type']) + note.append(_('Transaction family') + ': ' + line['transaction_family']) + note.append(_('Transaction code') + ': ' + line['transaction_code']) + note.append(_('Transaction category') + ': ' + line['transaction_category']) - err_string = '' - err_code = '' - coda_id = 0 - coda_note = '' - line_note = '' - - try: - coda_id = coda_obj.create(cr, uid, { - 'name': codafilename, - 'coda_data': codafile, - 'coda_creation_date': coda_statement['date'], - 'date': fields.date.context_today(self, cr, uid, context=context), - 'user_id': uid, - }) - context.update({'coda_id': coda_id}) - - except osv.except_osv, e: - cr.rollback() - err_string = _('\nApplication Error : ') + str(e) - except Exception, e: - cr.rollback() - err_string = _('\nSystem Error : ') + str(e) - except: - cr.rollback() - err_string = _('\nUnknown Error : ') + str(e) - if err_string: - err_code = 'G0001' - if batch: - return (err_code, err_string) - raise osv.except_osv(_('CODA Import failed !'), err_string) - - nb_err = 0 - err_string = '' - coda_st_ids = [] - bk_st_ids = [] - - for statement in coda_statements: - - # The CODA Statement info is written to two objects: 'coda.bank.statement' and 'account.bank.statement' - - try: - normal2info = False - lines = statement['coda_statement_lines'] - if not statement['first_transaction_date']: - normal2info = True # don't create a bank statement for CODA's without transactions - else: - line_vals = [x for x in lines.itervalues()] - transactions = filter(lambda x: (x['type'] in ['globalisation', 'general', 'supplier', 'customer']) and x['amount'], line_vals) - if not transactions: - normal2info = True # don't create a bank statement for CODA's without transactions - if normal2info: - statement['type'] = 'info' # don't create a bank statement for CODA's without transactions - statement['coda_parsing_note'] += _("\n\nThe CODA Statement %s does not contain transactions, hence no Bank Statement has been created." \ - "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ - % (statement['name'], statement['name']) - - coda_st_id = coda_st_obj.create(cr, uid, { - 'name': statement['name'], - 'type': statement['type'], - 'coda_bank_account_id': statement['coda_bank_account_id'], - 'currency': statement['currency_id'], - 'journal_id': statement['journal_id'], - 'coda_id': coda_id, - 'date': statement['date'], - 'coda_creation_date': statement['coda_creation_date'], - 'period_id': statement['period_id'], - 'old_balance_date': statement['old_balance_date'], - 'new_balance_date': statement['new_balance_date'], - 'balance_start': statement['balance_start'], - 'balance_end_real': statement['balance_end_real'], - }) - coda_st_ids.append(coda_st_id) - - # check duplicates for CODA's of type 'normal' - discard = False - if statement['type'] == 'normal' and statement['discard_dup']: - dup_ids = bank_st_obj.search(cr, uid, [('name', '=', statement['name']), ('company_id', '=', company_id)]) - if dup_ids: - discard = True - statement['type'] = 'info' # don't create a bank statement for duplicates - statement['coda_parsing_note'] += _("\n\nThe Bank Statement %s already exists, hence no duplicate Bank Statement has been created." \ - "\nSelect the 'CODA Bank Statement' to check the contents of %s.") \ - % (statement['name'], statement['name']) - - # create only bank statement for CODA's of type 'normal' - if statement['type'] == 'normal' and not discard: - context.update({'ebanking_import': 1}) - journal = journal_obj.browse(cr, uid, statement['journal_id'], context=context) - balance_start_check_date = statement['first_transaction_date'] or statement['date'] - cr.execute('SELECT balance_end_real \ - FROM account_bank_statement \ - WHERE journal_id = %s and date <= %s \ - ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'], balance_start_check_date)) - res = cr.fetchone() - balance_start_check = res and res[0] - if balance_start_check == None: - if journal.default_debit_account_id and (journal.default_credit_account_id == journal.default_debit_account_id): - balance_start_check = journal.default_debit_account_id.balance + try: + if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: + line['counterpartyNumber'] = False + except: + pass + if 'counterpartyNumber' in line and line['counterpartyNumber']: + ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) + if ids and len(ids) > 0: + partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0],context=context).partner_id.id else: - nb_err += 1 - err_string += _('\nConfiguration Error in journal %s!' \ - '\nPlease verify the Default Debit and Credit Account settings.') % journal.name - break - if balance_start_check != statement['balance_start']: - balance_start_err_string = _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!') \ - % (statement['name'], statement['balance_start'], balance_start_check, journal.name) - if statement['balance_start_enforce']: - nb_err += 1 - err_string += balance_start_err_string - break - else: - statement['coda_parsing_note'] += '\n' + balance_start_err_string + partner_id = None - st_vals = { - 'name': statement['name'], - 'journal_id': statement['journal_id'], - 'coda_statement_id': coda_st_id, - 'date': statement['new_balance_date'], - 'period_id': statement['period_id'], - 'balance_start': statement['balance_start'], - 'balance_end_real': statement['balance_end_real'], - 'state': 'draft', + data = { + 'name': line['communication'], + 'note': "\n".join(note), + 'date': line['entryDate'], + 'amount': line['amount'], + # 'type': '', + 'partner_id': partner_id, + 'account_id': 1, + 'statement_id': statement['id'], + # 'analytic_account_id': '', + # 'move_ids': '', + 'ref': line['ref'], + 'sequence': line['sequence'], } - st_hook_error, st_vals = self._statement_hook(cr, uid, statement['coda_bank_params'], st_vals, context=context) - if st_hook_error: - nb_err += 1 - err_string += st_hook_error - break - bk_st_id = bank_st_obj.create(cr, uid, st_vals, context=context) - bk_st_ids.append(bk_st_id) - coda_st_obj.write(cr, uid, [coda_st_id], {'statement_id': bk_st_id}, context=context) - - st_line_seq = 0 - - for x in lines: - line = lines[x] - - if not line['type'] == 'communication': - if line['trans_family'] in st_line_name_families: - line['name'] = get_st_line_name(line, context) - if line['type'] == 'information': - if line['struct_comm_type'] in parse_comms_info: - line['name'], line['communication'] = parse_comm_info(self, cr, uid, line, comm_type_table, context) - elif line['struct_comm_type'] in parse_comms_move: - line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) - elif line['struct_comm_type'] in parse_comms_move: - line['name'], line['communication'] = parse_comm_move(self, cr, uid, line, comm_type_table, context) - - # handling non-transactional records : line['type'] in ['information', 'communication'] - - if line['type'] == 'information': - - - #Check if this line can be deleted. glob_id_stack marked as undefined here - line['globalisation_id'] = glob_id_stack[-1][2] - line_note = _('Transaction Type' ': %s - %s' \ - '\nTransaction Family: %s - %s' \ - '\nTransaction Code: %s - %s' \ - '\nTransaction Category: %s - %s' \ - '\nStructured Communication Type: %s - %s' \ - '\nCommunication: %s') \ - % (line['trans_type'], line['trans_type_desc'], - line['trans_family'], line['trans_family_desc'], - line['trans_code'], line['trans_code_desc'], - line['trans_category'], line['trans_category_desc'], - line['struct_comm_type'], line['struct_comm_type_desc'], - line['communication']) - - coda_st_line_obj.create(cr, uid, { - 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'].strip() or '/', - 'type': 'information', - 'date': line['entry_date'], - 'statement_id': coda_st_id, - 'note': line_note, - }) - - elif line['type'] == 'communication': - - line_note = _('Free Communication:\n %s') \ - % (line['communication']) - - coda_st_line_obj.create(cr, uid, { - 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'].strip() or '/', - 'type': 'communication', - 'date': statement['date'], - 'statement_id': coda_st_id, - 'note': line_note, - }) - - # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer'] - - else: - - if line['ref_move_detail'] == '0000': - glob_id_stack = [(0, '', 0, '')] # initialise stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name) - - glob_lvl_flag = line['glob_lvl_flag'] - if glob_lvl_flag: - if glob_id_stack[-1][0] == glob_lvl_flag: - line['globalisation_id'] = glob_id_stack[-1][2] - glob_id_stack.pop() - else: - glob_name = line['name'].strip() or '/' - glob_code = seq_obj.get(cr, uid, 'statement.line.global') - glob_id = glob_obj.create(cr, uid, { - 'code': glob_code, - 'name': glob_name, - 'type': 'coda', - 'parent_id': glob_id_stack[-1][2], - 'amount': line['globalisation_amount'], - }) - line['globalisation_id'] = glob_id - glob_id_stack.append((glob_lvl_flag, glob_code, glob_id, glob_name)) - - line_note = _('Partner Name: %s \nPartner Account Number: %s' \ - '\nTransaction Type: %s - %s' \ - '\nTransaction Family: %s - %s' \ - '\nTransaction Code: %s - %s' \ - '\nTransaction Category: %s - %s' \ - '\nStructured Communication Type: %s - %s' \ - '\nPayment Reference: %s' \ - '\nCommunication: %s') \ - % (line['counterparty_name'], line['counterparty_number'], - line['trans_type'], line['trans_type_desc'], - line['trans_family'], line['trans_family_desc'], - line['trans_code'], line['trans_code_desc'], - line['trans_category'], line['trans_category_desc'], - line['struct_comm_type'], line['struct_comm_type_desc'], - line['payment_reference'], - line['communication']) - - if line['type'] == 'globalisation': - - coda_st_line_obj.create(cr, uid, { - 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'].strip() or '/', - 'type': 'globalisation', - 'val_date': line['val_date'], - 'date': line['entry_date'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_amount': line['globalisation_amount'], - 'globalisation_id': line['globalisation_id'], - 'partner_id': line['partner_id'] or 0, - 'account_id': line['account_id'], - 'payment_reference': line['payment_reference'], - 'statement_id': coda_st_id, - 'note': line_note, - }) - - else: # line['type'] in ['general', 'supplier', 'customer'] - - if glob_lvl_flag == 0: - line['globalisation_id'] = glob_id_stack[-1][2] - if not line['account_id']: - line['account_id'] = awaiting_acc - - coda_st_line_obj.create(cr, uid, { - 'sequence': line['sequence'], - 'ref': line['ref'], - 'name': line['name'].strip() or '/', - 'type': line['type'], - 'val_date': line['val_date'], - 'date': line['entry_date'], - 'amount': line['amount'], - 'partner_id': line['partner_id'] or 0, - 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], - 'account_id': line['account_id'], - 'globalisation_level': line['glob_lvl_flag'], - 'globalisation_id': line['globalisation_id'], - 'payment_reference': line['payment_reference'], - 'statement_id': coda_st_id, - 'note': line_note, - }) - - if statement['type'] == 'normal': - if line['amount'] != 0.0: - st_line_seq += 1 - voucher_id = False - line_name = line['name'].strip() - if not line_name: - if line['globalisation_id']: - line_name = glob_id_stack[-1][3] or '/' - else: - line_name = '/' - - if line['reconcile']: - - move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) - company_currency_id = journal.company_id.currency_id.id - currency_id = journal.currency.id - if currency_id and currency_id != company_currency_id: - multi_currency = True - else: - multi_currency = False - context_multi_currency = context.copy() - context_multi_currency.update({'date': line['entry_date']}) - - line_cr_ids = [] - line_dr_ids = [] - amount_remaining = abs(line['amount']) - - #for entry in entries: - if move_line.reconcile_partial_id: - amount_original = abs(move_line.amount_residual_currency) - else: - amount_original = move_line.credit or move_line.debit - if multi_currency: - if move_line.currency_id and move_line.amount_currency: - amount_original = abs(move_line.amount_currency) - else: - amount_original = currency_obj.compute(cr, uid, company_currency_id, currency_id, amount_original, context=context_multi_currency) - if amount_remaining > 0: - amount_voucher_line = min(amount_original, abs(amount_remaining)) - amount_remaining -= amount_voucher_line - else: - amount_voucher_line = 0.0 - voucher_line_vals = { - 'name': move_line.name, - 'account_id': move_line.account_id.id, - 'amount': amount_voucher_line, - 'reconcile': amount_voucher_line == amount_original, - 'type': move_line.credit and 'dr' or 'cr', - 'move_line_id': move_line.id, - } - if voucher_line_vals['type'] == 'cr': - line_cr_ids += [(0, 0, voucher_line_vals)] - else: - line_dr_ids += [(0, 0, voucher_line_vals)] - - voucher_vals = { - 'type': line['type'] == 'supplier' and 'payment' or 'receipt', - 'name': line_name, - 'date': line['val_date'], - 'journal_id': statement['journal_id'], - 'account_id': journal.default_credit_account_id.id, - 'line_cr_ids': line_cr_ids, - 'line_dr_ids': line_dr_ids, - 'pre_line': len(line_dr_ids) > 0 and True or False, - 'period_id': statement['period_id'], - 'currency_id': journal.currency and journal.currency.id or journal.company_id.currency_id.id, - 'company_id': journal.company_id.id, - 'state': 'draft', - 'amount': abs(line['amount']), - 'reference': line['ref'], - 'number': statement['name'] + '/' + str(st_line_seq), - 'partner_id': line['partner_id'], - } - - #_logger.warn('voucher_vals=%s, context=%s', voucher_vals, context) - context['journal_id'] = journal.id # add journal to context for __get_payment_rate_currency method - if line_cr_ids or line_dr_ids: - voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context) - else: - raise osv.except_osv(_('Error!'), _("Reconcile error while processing line with ref '%s' ! " \ - "\nPlease report this issue via your OpenERP support channel.") % line['ref']) - - # override default account mapping by mappings defined in rules engine - if statement['account_mapping_ids']: - kwargs = { - 'coda_bank_account_id': statement['coda_bank_account_id'], - 'trans_type_id': line['trans_type_id'], - 'trans_family_id': line['trans_family_id'], - 'trans_code_id': line['trans_code_id'], - 'trans_category_id': line['trans_category_id'], - 'struct_comm_type_id': line['struct_comm_type_id'], - 'partner_id': line['partner_id'], - 'context': context, - } - account_id = account_mapping_obj.account_id_get(cr, uid, **kwargs) - if account_id: - line['account_id'] = account_id - st_line_vals = { - 'ref': line['ref'], - 'name': line_name, - 'type': line['type'], - 'val_date': line['val_date'], - 'date': line['entry_date'], - 'amount': line['amount'], - 'partner_id': line['partner_id'] or 0, - 'counterparty_name': line['counterparty_name'], - 'counterparty_bic': line['counterparty_bic'], - 'counterparty_number': line['counterparty_number'], - 'counterparty_currency': line['counterparty_currency'], - 'account_id': line['account_id'], - 'globalisation_id': line['globalisation_id'], - 'statement_id': bk_st_id, - 'voucher_id': voucher_id, - 'note': line_note, - } - - st_lines_vals = self._st_line_hook(cr, uid, statement['coda_bank_params'], st_line_vals, context=context) - if not st_lines_vals: - # removal of lines by the _coda_parsing_hook currently not supported : - # this qould require resequencing/renaming of linked vouchers & moves as well as removal of associated voucher/moves - err_string += _('\nError in _st_line_hook while processing CODA Statement %s for Bank Account %s!') \ - % (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description'])) - nb_err += 1 - for st_line_vals in st_lines_vals: - # To DO : update sequence of statement lines and naming of associated vouchers/moves when the hook returns multiple lines - st_line_vals.update({'sequence': st_line_seq}) - bank_st_line_obj.create(cr, uid, st_line_vals, context=context) - if st_line_vals['voucher_id']: - voucher = voucher_obj.browse(cr, uid, st_line_vals['voucher_id'], context=context) - move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context) - if line['amount'] == (line['amount'] > 0 and move_line.debit or -move_line.credit): - wf_service.trg_validate(uid, 'account.voucher', st_line_vals['voucher_id'], 'proforma_voucher', cr) - if voucher.move_id: - move_line_obj.write(cr, uid, [x.id for x in voucher.move_ids], {'statement_id': bk_st_id}, context=context) - - # end 'for x in lines' - - coda_st_obj.write(cr, uid, [coda_st_id], {}, context=context) # calculate balance - st_balance = coda_st_obj.read(cr, uid, coda_st_id, ['balance_end', 'balance_end_real'], context=context) - if st_balance['balance_end'] != st_balance['balance_end_real']: - err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s!') \ - % (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description'])) - if statement['type'] == 'normal': - nb_err += 1 - break - else: - statement['coda_parsing_note'] += '\n' + err_string - - if statement['type'] == 'normal': - bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance - journal_name = journal.name - else: - journal_name = _('None') - coda_note = coda_note + \ - _('\n\nBank Journal: %s' \ - '\nCODA Version: %s' \ - '\nCODA Sequence Number: %s' \ - '\nPaper Statement Sequence Number: %s' \ - '\nBank Account: %s' \ - '\nAccount Holder Name: %s' \ - '\nDate: %s, Starting Balance: %.2f, Ending Balance: %.2f' \ - '%s') \ - % (journal_name, - coda_version, - statement['coda_seq_number'], - statement['paper_nb_seq_number'], - (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description']), - statement['acc_holder'], - statement['date'], float(statement['balance_start']), float(statement['balance_end_real']), - statement['coda_parsing_note'] % {'name': coda_statement['name']}) - if statement.get('separate_application') != '00000': - coda_note += _('\nCode Separate Application: %s') % statement['separate_application'] \ - - except osv.except_osv, e: - cr.rollback() - nb_err += 1 - err_string += _('\nError ! ') + str(e) - tb = ''.join(format_exception(*exc_info())) - _logger.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.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.error('Unknown Error while processing Statement %s\n%s', - statement.get('name', '/'), tb) - - # end 'for statement in coda_statements' - - coda_note_header = _('CODA File is Imported :') - coda_note_footer = _('\n\nNumber of statements : ') + str(len(coda_st_ids)) - err_log = err_log + _('\nNumber of errors : ') + str(nb_err) + '\n' - - if not nb_err: - note = coda_note_header + coda_note + coda_note_footer - coda_obj.write(cr, uid, [coda_id], {'note': note}) - cr.commit() - if batch: - return None - else: - cr.rollback() - if batch: - err_code = 'G0002' - return (err_code, err_string) - raise osv.except_osv(_('CODA Import failed !'), err_string) - - context.update({'bk_st_ids': bk_st_ids}) - model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_import_result_view')], context=context) - resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] - self.write(cr, uid, ids, {'note': note}, context=context) - - return { - 'name': _('Import CODA File result'), - 'res_id': ids[0], - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'account.coda.import', - 'view_id': False, - 'target': 'new', - 'views': [(resource_id, 'form')], - 'context': context, - 'type': 'ir.actions.act_window', - } - - def _statement_hook(self, cr, uid, coda_bank_params, st_vals, context=None): - """ - Use this method to take customer specific actions based upon the bank statement data. - Returns: - st_hook_error : False or string with error message - st_vals - """ - return False, st_vals - - def _st_line_hook(self, cr, uid, coda_bank_params, st_line_vals, context=None): - """ - Use this method to adapt the statement line created by the - CODA parsing to customer specific needs. - """ - print 'PLZ DISPLAY SOMETHING RIGHTPLZPLZPLZ' - print st_line_vals['name'] - print st_line_vals['counterparty_name'] - return [st_line_vals] - - def action_open_coda_statements(self, cr, uid, ids, context=None): - if context is None: - context = {} - module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements' - res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id) - action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context) - domain = eval(action.get('domain') or '[]') - domain += [('coda_id', '=', context.get('coda_id', False))] - action.update({'domain': domain}) - return action - - def action_open_bank_statements(self, cr, uid, ids, context=None): - if context is None: - context = {} - module, xml_id = 'account', 'action_bank_statement_tree' - res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id) - action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context) - domain = eval(action.get('domain') or '[]') - domain += [('id', 'in', context.get('bk_st_ids', False))] - action.update({'domain': domain}) - return action + self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) account_coda_import() +transaction_types = { + "0": ["", _("Simple amount without detailed data; e.g. : an individual credit transfer [free of charges].")], + "1": ["", _("Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is ]debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following [type 5].")], + "5": ["1", _("Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record [type 1].")], + "2": ["", _("Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data [type 6 or 7] is following.")], + "6": ["2", _("Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6.")], + "7": ["2", _("Detail of 2. Simple account with detailed data The records in a separate application keep type 7.")], + "9": ["7", _("Detail of 7. The records in a separate application keep type 9.")], + "3": ["", _("Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers.")], + "8": ["3", _("Detail of 3.")], +} -def repl_special(s): - s = s.replace("\'", "\'" + "'") - return s +transaction_codes = { + "00": [_("Undefined transactions"), { + "89": _("Cancellation of a transaction"), + "87": _("Costs refunded"), + "85": _("Correction"), + "83": _("Value correction"), + "39": _("Cancellation of a transaction"), + "37": _("Costs"), + "35": _("Correction"), + "33": _("Value correction"), + "00": _("Undefined transaction") + }], + "01": [_("Domestic or local SEPA credit transfers"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "66": _("Financial centralization"), + "64": _("Transfer to your account"), + "62": _("Unpaid postal order"), + "60": _("Non-presented circular cheque"), + "54": _("Unexecutable transfer order"), + "52": _("Payment in your favour"), + "51": _("Transfer in your favour – initiated by the bank"), + "50": _("Transfer in your favour"), + "49": _("Cancellation or correction"), + "39": _("Your issue circular cheque"), + "37": _("Costs"), + "17": _("Financial centralisation"), + "15": _("Balance due insurance premium"), + "13": _("Transfer from your account"), + "11": _("Your semi-standing order – payment to employees"), + "09": _("Your semi-standing order"), + "07": _("Collective transfer"), + "05": _("Payment of wages etc."), + "03": _("Standing order"), + "02": _("Individual transfer order initiated by the bank"), + "01": _("Individual transfer order]"), + }], + "03": [_("Cheques"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of cheque-related costs"), + "68": _("Credit of a payment via electronic purse"), + "66": _("Remittance of cheque by your branch - credit under usual reserve"), + "64": _("Reversal of settlement of credit card"), + "63": _("Second credit of unpaid cheque"), + "62": _("Reversal of cheque"), + "60": _("Reversal of voucher"), + "58": _("Remittance of cheques, vouchers, etc. credit after collection"), + "56": _("Non-presented certified cheques"), + "52": _("First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve"), + "50": _("Credit of a payment via terminal"), + "49": _("Cancellation or correction"), + "39": _("Provisionally unpaid due to other reason than manual presentation"), + "38": _("Provisionally unpaid"), + "37": _("Cheque-related costs"), + "35": _("Cash advance"), + "19": _("Settlement of credit cards"), + "17": _("Your certified cheque"), + "15": _("Your purchase bank cheque"), + "13": _("Eurocheque written out abroad"), + "11": _("Department store cheque"), + "09": _("Unpaid voucher"), + "07": _("Definitely unpaid cheque"), + "05": _("Payment of voucher"), + "03": _("Your purchase by payment card"), + "01": _("Payment of your cheque"), + }], + "04": [_("Cards"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "68": _("Credit after Proton payments"), + "55": _("Income from payments by GSM"), + "53": _("Cash deposit at an ATM"), + "52": _("Loading GSM cards"), + "51": _("Unloading Proton"), + "50": _("Credit after a payment at a terminal"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "08": _("Payment by means of a payment card outside the Eurozone"), + "07": _("Payment by GSM"), + "06": _("Payment with tank card"), + "05": _("Loading Proton"), + "04": _("Cash withdrawal from an ATM"), + "03": _("Settlement credit cards"), + "02": _("Payment by means of a payment card within the Eurozone"), + "01": _("Loading a GSM card"), + }], + "05": [_("Direct debit"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "58": _("Reversal"), + "56": _("Unexecutable reimbursement"), + "54": _("Reimbursement"), + "52": _("Credit under usual reserve"), + "50": _("Credit after collection"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "05": _("Reimbursement"), + "03": _("Unpaid debt"), + "01": _("Payment"), + }], + "07": [_("Domestic commercial paper"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "86": _("Payment after cession"), + "64": _("Warrant"), + "58": _("Remittance of supplier's bill without guarantee"), + "56": _("Remittance of supplier's bill with guarantee"), + "54": _("Remittance of commercial paper for discount"), + "52": _("Remittance of commercial paper - credit under usual reserve"), + "50": _("Remittance of commercial paper - credit after collection"), + "49": _("Cancellation or correction"), + "39": _("Return of an irregular bill of exchange"), + "37": _("Costs related to commercial paper"), + "14": _("Warrant fallen due"), + "12": _("Safe custody"), + "10": _("Renewal of agreed maturity date"), + "09": _("Agio on supplier's bill"), + "08": _("Payment in advance"), + "07": _("Unpaid commercial paper"), + "06": _("Extension of maturity date"), + "05": _("Commercial paper claimed back"), + "03": _("Payment receipt card"), + "01": _("Payment commercial paper"), + }], + "09": [_("Counter transactions"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Sale of traveller’s cheque"), + "68": _("Difference in payment"), + "66": _("Repurchase of petrol coupons"), + "64": _("Your winning lottery ticket"), + "62": _("Sale of gold/pieces under usual reserve"), + "60": _("Sale of foreign bank notes"), + "58": _("Payment by your branch/agents"), + "56": _("Reserve"), + "54": _("Your payment ATM"), + "52": _("Payment night safe"), + "50": _("Cash payment"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "25": _("Purchase of traveller’s cheque"), + "21": _("Cash withdrawal on card (PROTON)"), + "19": _("Difference in payment"), + "17": _("Purchase of fiscal stamps"), + "15": _("Your purchase of lottery tickets"), + "13": _("Cash withdrawal by your branch or agents"), + "11": _("Your purchase of luncheon vouchers"), + "09": _("Purchase of petrol coupons"), + "07": _("Purchase of gold/pieces"), + "05": _("Purchase of foreign bank notes"), + "03": _("Cash withdrawal by card (ATM)"), + "01": _("Cash withdrawal"), + }], + "11": [_("Securities"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Settlement of securities"), + "68": _("Compensation for missing coupon"), + "66": _("Retrocession of issue commission"), + "64": _("Your issue"), + "62": _("Interim interest on subscription"), + "58": _("Repayable securities from a deposit or delivered at the counter - credit under usual reserve"), + "56": _("Reserve"), + "52": _("Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve"), + "51": _("Tender"), + "50": _("Sale of securities"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "19": _("Regularisation costs"), + "17": _("Management fee"), + "15": _("Interim interest on subscription"), + "13": _("Your repurchase of issue"), + "11": _("Payable coupons/repayable securities"), + "09": _("Settlement of securities"), + "06": _("Share option plan – exercising an option"), + "05": _("Partial payment subscription"), + "04": _("Issues"), + "03": _("Subscription to securities"), + "02": _("Tenders"), + "01": _("Purchase of securities"), + }], + "13": [_("Credit"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Settlement of discount bank acceptance"), + "68": _("Documentary export credits"), + "62": _("Term loan"), + "60": _("Settlement of mortgage loan"), + "56": _("Subsidy"), + "55": _("Fixed advance – interest only"), + "54": _("Fixed advance – capital and interest"), + "50": _("Settlement of instalment credit"), + "49": _("Cancellation or correction"), + "37": _("Credit-related costs"), + "21": _("Other credit applications"), + "19": _("Documentary import credits"), + "15": _("Your repayment hire-purchase and similar claims"), + "13": _("Settlement of bank acceptances"), + "11": _("Your repayment mortgage loan"), + "07": _("Your repayment instalment credits"), + "05": _("Settlement of fixed advance"), + "02": _("Long-term loan"), + "01": _("Short-term loan"), + }], + "30": [_("Various transactions"), { + "99": _("Cancellation or correction"), + "89": _("Undefined transaction"), + "87": _("Reimbursement of costs"), + "83": _("Value (date) correction"), + "55": _("Interest term investment"), + "54": _("Capital and/or interest term investment"), + "52": _("Forward sale of foreign exchange"), + "50": _("Spot sale of foreign exchange"), + "49": _("Cancellation or correction"), + "39": _("Undefined transaction"), + "37": _("Costs"), + "33": _("Value (date) correction"), + "05": _("Capital and/or interest term investment"), + "03": _("Forward purchase of foreign exchange"), + "01": _("Spot purchase of foreign exchange"), + }], + "35": [_("Closing (periodical settlements for interest, costs,…)"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "50": _("Closing"), + "49": _("Cancellation or correction"), + "37": _("Costs"), + "01": _("Closing"), + }], + "41": [_("International credit transfers - non-SEPA credit transfers"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "66": _("Financial centralisation (credit)"), + "64": _("Transfer to your account"), + "50": _("Transfer"), + "49": _("Cancellation or correction"), + "38": _("Costs relating to incoming foreign and non-SEPA transfers"), + "37": _("Costs relating to outgoing foreign transfers and non-SEPA transfers"), + "17": _("Financial centralisation (debit)"), + "13": _("Transfer from your account"), + "07": _("Collective transfers"), + "05": _("Collective payments of wages"), + "03": _("Standing order"), + "01": _("Transfer"), + }], + "43": [_("Foreign cheques"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "70": _("Purchase of traveller’s cheque"), + "62": _("Reversal of cheques"), + "58": _("Remittance of foreign cheque credit after collection"), + "52": _("Remittance of foreign cheque credit under usual reserve"), + "49": _("Cancellation or correction"), + "37": _("Costs relating to payment of foreign cheques"), + "15": _("Purchase of an international bank cheque"), + "07": _("Unpaid foreign cheque"), + "01": _("Payment of a foreign cheque"), + }], + "47": [_("Foreign commercial paper"), { + "99": _("Cancellation or correction"), + "87": _("Reimbursement of costs"), + "64": _("Warrant"), + "62": _("Remittance of documents abroad - credit after collection"), + "60": _("Remittance of documents abroad - credit under usual reserve"), + "58": _("Idem without guarantee"), + "56": _("Remittance of guaranteed foreign supplier's bill"), + "54": _("Discount abroad"), + "52": _("Remittance of foreign bill credit under usual reserve"), + "50": _("Remittance of foreign bill credit after collection"), + "49": _("Cancellation or correction"), + "37": _("Costs relating to the payment of a foreign bill"), + "14": _("Warrant fallen due"), + "13": _("Discount foreign supplier's bills"), + "11": _("Payment documents abroad"), + "07": _("Unpaid foreign bill"), + "06": _("Extension"), + "05": _("Bill claimed back"), + "01": _("Payment of foreign bill"), + }], + "49": [_("Foreign counter transactions"), {"03": _("ATM withdrawal")}], + "80": [_("Separately charged costs and provisions"), { + "01": _("Guarantee card charges"), + "02": _("Costs relating to electronic output"), + "03": _("Payment card charges"), + "04": _("Costs for holding a documentary cash credit"), + "05": _("Card charges"), + "06": _("Damage relating to bills and cheques"), + "07": _("Insurance costs"), + "08": _("Registering compensation for savings accounts"), + "09": _("Postage"), + "10": _("Purchase of Smartcard"), + "11": _("Costs for the safe custody of correspondence"), + "12": _("Costs for opening a bank guarantee"), + "13": _("Renting of safes"), + "14": _("Handling costs instalment credit"), + "15": _("Night safe"), + "16": _("Bank confirmation to revisor or accountant"), + "17": _("Charge for safe custody"), + "18": _("Trade information"), + "19": _("Special charge for safe custody"), + "20": _("Drawing up a certificate"), + "21": _("Pay-packet charges"), + "22": _("Management/custody"), + "23": _("Research costs"), + "24": _("Participation in and management of interest refund system"), + "25": _("Renting of direct debit box"), + "26": _("Travel insurance premium"), + "27": _("Subscription fee"), + "29": _("Information charges"), + "31": _("Writ service fee"), + "33": _("Miscellaneous fees and commissions"), + "35": _("Costs"), + "37": _("Access right to database"), + "39": _("Surety fee"), + "41": _("Research costs"), + "43": _("Printing of forms"), + "45": _("Documentary credit charges"), + "47": _("Charging fees for transactions"), + "49": _("Cancellation or correction"), + "99": _("Cancellation or correction"), + }], +} + +transaction_categories = { + "000": _("Net amount"), + "001": _("Interest received"), + "002": _("Interest paid"), + "003": _("Credit commission"), + "004": _("Postage"), + "005": _("Renting of letterbox"), + "006": _("Various fees/commissions"), + "007": _("Access right to database"), + "008": _("Information charges"), + "009": _("Travelling expenses"), + "010": _("Writ service fee"), + "011": _("VAT"), + "012": _("Exchange commission"), + "013": _("Payment commission"), + "014": _("Collection commission"), + "015": _("Correspondent charges"), + "016": _("BLIW/IBLC dues"), + "017": _("Research costs"), + "018": _("Tental guarantee charges"), + "019": _("Tax on physical delivery"), + "020": _("Costs of physical delivery"), + "021": _("Costs for drawing up a bank cheque"), + "022": _("Priority costs"), + "023": _("Exercising fee"), + "024": _("Growth premium"), + "025": _("Individual entry for exchange charges"), + "026": _("Handling commission"), + "027": _("Charges for unpaid bills"), + "028": _("Fidelity premium"), + "029": _("Protest charges"), + "030": _("Account insurance"), + "031": _("Charges foreign cheque"), + "032": _("Drawing up a circular cheque"), + "033": _("Charges for a foreign bill"), + "034": _("Reinvestment fee"), + "035": _("Charges foreign documentary bill"), + "036": _("Costs relating to a refused cheque"), + "037": _("Commission for handling charges"), + "039": _("Telecommunications"), + "041": _("Credit card costs"), + "042": _("Payment card costs"), + "043": _("Insurance costs"), + "045": _("Handling costs"), + "047": _("Charges extension bill"), + "049": _("Fiscal stamps/stamp duty"), + "050": _("Capital term investment"), + "051": _("Withholding tax"), + "052": _("Residence state tax"), + "053": _("Printing of forms"), + "055": _("Repayment loan or credit capital"), + "057": _("Interest subsidy"), + "058": _("Capital premium"), + "059": _("Default interest"), + "061": _("Charging fees for transactions"), + "063": _("Rounding differences"), + "065": _("Interest payment advice"), + "066": _("Fixed loan advance - reimbursement"), + "067": _("Fixed loan advance - extension"), + "068": _("Countervalue of an entry"), + "069": _("Forward arbitrage contracts : sum to be supplied by customer"), + "070": _("Forward arbitrage contracts : sum to be supplied by bank"), + "071": _("Fixed loan advance - availability"), + "072": _("Countervalue of commission to third party"), + "073": _("Costs of ATM abroad"), + "074": _("Mailing costs"), + "100": _("Gross amount"), + "200": _("Overall documentary credit charges"), + "201": _("Advice notice commission"), + "202": _("Advising commission | Additional advising commission"), + "203": _("Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission"), + "204": _("Amendment fee"), + "205": _("Documentary payment commission | Document commission | Drawdown fee | Negotiation fee"), + "206": _("Surety fee/payment under reserve"), + "207": _("Non-conformity fee"), + "208": _("Commitment fee deferred payment"), + "209": _("Transfer commission"), + "210": _("Commitment fee"), + "211": _("Credit arrangement fee | Additional credit arrangement fee"), + "212": _("Warehousing fee"), + "213": _("Financing fee"), + "214": _("Issue commission (delivery order)"), + "400": _("Acceptance fee"), + "401": _("Visa charges"), + "402": _("Certification costs"), + "403": _("Minimum discount rate"), + "404": _("Discount commission"), + "405": _("Bill guarantee commission"), + "406": _("Collection charges"), + "407": _("Costs Article 45"), + "408": _("Cover commission"), + "409": _("Safe deposit charges"), + "410": _("Reclamation charges"), + "411": _("Fixed collection charge"), + "412": _("Advice of expiry charges"), + "413": _("Acceptance charges"), + "414": _("Regularisation charges"), + "415": _("Surety fee"), + "416": _("Charges for the deposit of security"), + "418": _("Endorsement commission"), + "419": _("Bank service fee"), + "420": _("Retention charges"), + "425": _("Foreign broker's commission"), + "426": _("Belgian broker's commission"), + "427": _("Belgian Stock Exchange tax"), + "428": _("Interest accrued"), + "429": _("Foreign Stock Exchange tax"), + "430": _("Recovery of foreign tax"), + "431": _("Delivery of a copy"), +} -def str2date(date_str): - try: - return time.strftime('%Y-%m-%d', time.strptime(date_str, '%d%m%y')) - except: - return False +def rmspaces(s): + return " ".join(s.split()) -def str2time(time_str): - return time_str[:2] + ':' + time_str[2:] - -def str2float(str): - try: - return float(str) - except: - return 0.0 - - -def list2float(lst): - try: - return str2float((lambda s: s[:-3] + '.' + s[-3:])(lst)) - except: - return 0.0 - - -def number2float(s, d): - try: - return float(s[:len(s) - d] + '.' + s[len(s) - d:]) - except: - return False - - -def _get_acc_numbers(acc_number): - #TODO this method is needed because the iban and bank account fields have been merged together. But sometimes we - # need to retrieve the normal bank account from the IBAN. This should be globalized and defined as a method on the - # bank account class. Each country part of the IBAN area should define its own code to do so. - acc_number = acc_number.replace(' ', '') - if acc_number.lower().startswith('be'): - return [acc_number[4:], acc_number] - return [acc_number] - -from base_iban.base_iban import _ref_iban, _format_iban - - -def calc_iban_checksum(country, bban): - bban = bban.replace(' ', '').upper() + country.upper() + '00' - base = '' - for c in bban: - if c.isdigit(): - base += c - else: - base += str(ord(c) - ord('A') + 10) - kk = 98 - int(base) % 97 - return str(kk).rjust(2, '0') - - -def check_bban(country, bban): - if country == 'BE': - try: - int(bban) - except: - return False - if len(bban) != 12: - return False - return True - - -def check_iban(iban): - """ - Check the IBAN number (logic partially based upon base_iban module, cf. is_iban_valid method) - """ - iban = _format_iban(iban).lower() - if iban[:2] not in _ref_iban: - return False - if len(iban) != len(_format_iban(_ref_iban[iban[:2]])): - return False - #the four first digits have to be shifted to the end - iban = iban[4:] + iban[:4] - #letters have to be transformed into numbers (a = 10, b = 11, ...) - iban2 = "" - for char in iban: - if char.isalpha(): - iban2 += str(ord(char) - 87) - else: - iban2 += char - #iban is correct if modulo 97 == 1 - return int(iban2) % 97 == 1 - - -def get_bank(self, cr, uid, bic, iban): - - country_obj = self.pool.get('res.country') - bank_obj = self.pool.get('res.bank') - - bank_id = False - bank_name = False - feedback = False - bank_country = iban[:2] - try: - bank_country_id = country_obj.search(cr, uid, [('code', '=', bank_country)])[0] - except: - feedback = _("\n Bank lookup failed due to missing Country definition for Country Code '%s' !") \ - % (bank_country) - else: - if iban[:2] == 'BE' and 'code' in bank_obj.fields_get_keys(cr, uid): - # To DO : extend for other countries - bank_code = iban[4:7] - if bic: - bank_ids = bank_obj.search(cr, uid, [('bic', '=', bic), ('code', '=', bank_code), ('country', '=', bank_country_id)]) - if bank_ids: - bank_id = bank_ids[0] - else: - bank_id = bank_obj.create(cr, uid, { - 'name': bic, - 'code': bank_code, - 'bic': bic, - 'country': bank_country_id, - }) - else: - bank_ids = bank_obj.search(cr, uid, [('code', '=', bank_code), ('country', '=', bank_country_id)]) - if bank_ids: - bank_id = bank_ids[0] - bank_data = bank_obj.read(cr, uid, bank_id, fields=['bic', 'name']) - bic = bank_data['bic'] - bank_name = bank_data['name'] - else: - country = country_obj.browse(cr, uid, bank_country_id) - feedback = _("\n Bank lookup failed. Please define a Bank with Code '%s' and Country '%s' !") \ - % (bank_code, country.name) - else: - if not bic: - feedback = _("\n Bank lookup failed due to missing BIC in Bank Statement for IBAN '%s' !") \ - % (iban) - else: - bank_ids = bank_obj.search(cr, uid, [('bic', '=', bic), ('country', '=', bank_country_id)]) - if not bank_ids: - bank_name = bic - bank_id = bank_obj.create(cr, uid, { - 'name': bank_name, - 'bic': bic, - 'country': bank_country_id, - }) - else: - bank_id = bank_ids[0] - - return bank_id, bic, bank_name, feedback - - -def update_partner_bank(self, cr, uid, bic, iban, partner_id, counterparty_name): - partner_bank_obj = self.pool.get('res.partner.bank') - bank_id = False - feedback = False - if check_iban(iban): - bank_id, bic, bank_name, feedback = get_bank(self, cr, uid, bic, iban) - if not bank_id: - return feedback - else: - #convert belgian BBAN numbers to IBAN - if check_bban('BE', iban): - kk = calc_iban_checksum('BE', iban) - iban = 'BE' + kk + iban - bank_id, bic, bank_name, feedback = get_bank(self, cr, uid, bic, iban) - if not bank_id: - return feedback - - if bank_id: - partner_bank_obj.create(cr, uid, { - 'partner_id': partner_id, - 'name': counterparty_name, - 'bank': bank_id, - 'state': 'iban', - 'bank_bic': bic, - 'bank_name': bank_name, - 'acc_number': iban, - }) - return feedback - -indent = '\n' + 8 * ' ' -st_line_name_families = ['13', '35', '41', '80'] -parse_comms_move = ['100', '101', '102', '103', '105', '106', '107', '108', '111', '113', '114', '115', '121', '122', '123', '124', '125', '126', '127'] -parse_comms_info = ['001', '002', '004', '005', '006', '007', '107', '008', '009', '010', '011'] - - -def get_st_line_name(line, context): - #_logger.warn('get_st_line_name - entry').warn('ref = %s, family = %s, code = %s, categ = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category']) - st_line_name = line['name'] - - if line['trans_family'] == '35' and line['trans_code'] in ['01', '37']: - st_line_name = ', '.join([_('Closing'), line['trans_code_desc'], line['trans_category_desc']]) - - if line['trans_family'] in ['13', '41']: - st_line_name = ', '.join([line['trans_family_desc'], line['trans_code_desc'], line['trans_category_desc']]) - - if line['trans_family'] in ['80']: - st_line_name = ', '.join([line['trans_code_desc'], line['trans_category_desc']]) - - return st_line_name - - -def parse_comm_move(self, cr, uid, line, comm_type_table, context): - #_logger.warn('parse_comm_move - entry, ref = %s, family = %s, code = %s, categ = %s, comm_type = %s, name = %s', line['ref'], line['trans_family'], line['trans_code'], line['trans_category'], line['struct_comm_type'], line['name']) - comm_type = line['struct_comm_type'] - comm = st_line_comm = line['communication'] - st_line_name = line['name'] - - if comm_type in ['115', '121', '122', '126']: - _logger.warn('The parsing of Structured Commmunication Type %s has not yet been implemented. ' \ - 'Please contact Noviat (info@noviat.be) for more information about the development roadmap', comm_type) - - if comm_type == '100': - st_line_name = _('Payment with ISO 11649 structured format communication') - st_line_comm = '\n' + indent + _('Payment with a structured format communication applying the ISO standard 11649') + ':' - st_line_comm += indent + _('Structured creditor reference to remittance information') - st_line_comm += indent + comm - - if comm_type in ['101', '102']: - st_line_name = st_line_comm = '+++' + comm[0:3] + '/' + comm[3:7] + '/' + comm[7:12] + '+++' - - if comm_type == '103': - st_line_name = ', '.join([line['trans_family_desc'], _('Number')]) - st_line_comm = comm - - if comm_type == '105': - st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] - amount_1 = list2float(comm[0:15]) - amount_2 = list2float(comm[15:30]) - rate = number2float(comm[30:42], 8) - currency = comm[42:45] - struct_format_comm = comm[45:57].strip() - country_code = comm[57:59] - amount_3 = list2float(comm[59:74]) - st_line_comm = '\n' + indent + st_line_name + indent + _('Gross amount in the currency of the account') + ': %.2f' % amount_1 - st_line_comm += indent + _('Gross amount in the original currency') + ': %.2f' % amount_2 - st_line_comm += indent + _('Rate') + ': %.4f' % rate - st_line_comm += indent + _('Currency') + ': %s' % currency - st_line_comm += indent + _('Structured format communication') + ': %s' % struct_format_comm - st_line_comm += indent + _('Country code of the principal') + ': %s' % country_code - st_line_comm += indent + _('Equivalent in EUR') + ': %.2f' % amount_3 - - if comm_type == '106': - if not st_line_name and line['trans_family'] not in st_line_name_families: - st_line_name = _('VAT, withholding tax on income, commission, etc.') - interest = comm[30:42].strip('0') - st_line_comm = '\n' + indent + st_line_name + indent + _('Equivalent in the currency of the account') + ': %.2f' % list2float(comm[0:15]) - st_line_comm += indent + _('Amount on which % is calculated') + ': %.2f' % list2float(comm[15:30]) - st_line_comm += indent + _('Percent') + ': %.4f' % number2float(comm[30:42], 8) - st_line_comm += indent + (comm[42] == 1 and _('Minimum applicable') or _('Minimum not applicable')) - st_line_comm += indent + _('Equivalent in EUR') + ': %.2f' % list2float(comm[43:58]) - - if comm_type == '107': - paid_refusals = { - '0': _('paid'), - '1': _('direct debit cancelled or nonexistent'), - '2': _('refusal - other reason'), - 'D': _('payer disagrees'), - 'E': _('direct debit number linked to another identification number of the creditor')} - st_line_name = _('Direct debit - DOM\'80') - direct_debit_number = comm[0:12].strip() - pivot_date = str2date(comm[12:18]) - comm_zone = comm[18:48] - paid_refusal = paid_refusals.get(comm[48], '') - creditor_number = comm[49:60].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Direct Debit Number') + ': %s' % direct_debit_number - st_line_comm += indent + _('Central (Pivot) Date') + ': %s' % pivot_date - st_line_comm += indent + _('Communication Zone') + ': %s' % comm_zone - st_line_comm += indent + _('Paid or reason for refusal') + ': %s' % paid_refusal - st_line_comm += indent + _("Creditor's Number") + ': %s' % creditor_number - - if comm_type == '108': - st_line_name = _('Closing, period from %s to %s') % (str2date(comm[42:48]), str2date(comm[48:54])) - interest = comm[30:42].strip('0') - st_line_comm = '\n' + indent + st_line_name + indent + _('Equivalent in the currency of the account') + ': %.2f' % list2float(comm[0:15]) - if interest: - st_line_comm += indent + _('Interest rates, calculation basis') + ': %.2f' % list2float(comm[15:30]) + \ - indent + _('Interest') + ': %.2f' % list2float(comm[30:42]) - - if comm_type == '111': - card_schemes = { - '1': 'Bancontact/Mister Cash', - '2': _('Private'), - '3': 'Maestro', - '5': 'TINA', - '9': _('Other')} - trans_types = { - '1': _('Withdrawal'), - '2': _('Cumulative on network'), - '7': _('Distribution sector'), - '8': _('Teledata'), - '9': _('Fuel')} - st_line_name = _('POS credit - globalisation') - card_scheme = card_schemes.get(comm[0], '') - pos_number = comm[1:7].strip() - period_number = comm[7:10].strip() - first_sequence_number = comm[10:16].strip() - trans_first_date = str2date(comm[16:22]) - last_sequence_number = comm[22:28].strip() - trans_last_date = str2date(comm[28:34]) - trans_type = trans_types.get(comm[34], '') - terminal_name = comm[35:50].strip() - terminal_city = comm[51:60].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Card Scheme') + ': %s' % card_scheme - st_line_comm += indent + _('POS Number') + ': %s' % pos_number - st_line_comm += indent + _('Period Number') + ': %s' % period_number - st_line_comm += indent + _('First Transaction Sequence Number') + ': %s' % first_sequence_number - st_line_comm += indent + _('Date of first transaction') + ': %s' % trans_first_date - st_line_comm += indent + _('Last Transaction Sequence Number') + ': %s' % last_sequence_number - st_line_comm += indent + _('Date of last transaction') + ': %s' % trans_last_date - st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type - st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city - - if comm_type == '113': - card_schemes = { - '1': 'Bancontact/Mister Cash', - '2': 'Maestro', - '3': _('Private'), - '9': _('Other')} - trans_types = { - '1': _('Withdrawal'), - '2': _('Proton loading'), - '3': _('Reimbursement Proton balance'), - '4': _('Reversal of purchases'), - '7': _('Distribution sector'), - '8': _('Teledata'), - '9': _('Fuel')} - product_codes = { - '01': _('premium with lead substitute'), - '02': _('europremium'), - '03': _('diesel'), - '04': _('LPG'), - '06': _('premium plus 98 oct'), - '07': _('regular unleaded'), - '08': _('domestic fuel oil'), - '09': _('lubricants'), - '10': _('petrol'), - '11': _('premium 99+'), - '12': _('Avgas'), - '16': _('other types'), - } - st_line_name = _('ATM/POS debit') - card_number = comm[0:16].strip() - card_scheme = card_schemes.get(comm[16], '') - terminal_number = comm[17:23].strip() - sequence_number = comm[23:29].strip() - trans_date = comm[29:35].strip() and str2date(comm[29:35]) or '' - trans_hour = comm[35:39].strip() and str2time(comm[35:39]) or '' - trans_type = trans_types.get(comm[39], '') - terminal_name = comm[40:56].strip() - terminal_city = comm[56:66].strip() - orig_amount = comm[66:81].strip() and list2float(comm[66:81]) - rate = number2float(comm[81:93], 8) - currency = comm[93:96] - volume = number2float(comm[96:101], 2) - product_code = product_codes.get(comm[101:103], '') - unit_price = number2float(comm[103:108], 2) - st_line_comm = '\n' + indent + st_line_name + indent + _('Card Number') + ': %s' % card_number - st_line_comm += indent + _('Card Scheme') + ': %s' % card_scheme - if terminal_number: - st_line_comm += indent + _('Terminal Number') + ': %s' % terminal_number - st_line_comm += indent + _('Transaction Sequence Number') + ': %s' % sequence_number - st_line_comm += indent + _('Time') + ': %s' % trans_date + ' ' + trans_hour - st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type - st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city - if orig_amount: - st_line_comm += indent + _('Original Amount') + ': %.2f' % orig_amount - st_line_comm += indent + _('Rate') + ': %.4f' % rate - st_line_comm += indent + _('Currency') + ': %s' % currency - if volume: - st_line_comm += indent + _('Volume') + ': %.2f' % volume - if product_code: - st_line_comm += indent + _('Product Code') + ': %s' % product_code - if unit_price: - st_line_comm += indent + _('Unit Price') + ': %.2f' % unit_price - - if comm_type == '114': - card_schemes = { - '1': 'Bancontact/Mister Cash', - '2': 'Maestro', - '3': _('Private'), - '5': 'TINA', - '9': _('Other')} - trans_types = { - '1': _('Withdrawal'), - '7': _('Distribution sector'), - '8': _('Teledata'), - '9': _('Fuel')} - st_line_name = _('POS credit - individual transaction') - card_scheme = card_schemes.get(comm[0], '') - pos_number = comm[1:7].strip() - period_number = comm[7:10].strip() - sequence_number = comm[10:16].strip() - trans_date = str2date(comm[16:22]) - trans_hour = str2time(comm[22:26]) - trans_type = trans_types.get(comm[26], '') - terminal_name = comm[27:43].strip() - terminal_city = comm[43:53].strip() - trans_reference = comm[53:69].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Card Scheme') + ': %s' % card_scheme - st_line_comm += indent + _('POS Number') + ': %s' % pos_number - st_line_comm += indent + _('Period Number') + ': %s' % period_number - st_line_comm += indent + _('Transaction Sequence Number') + ': %s' % sequence_number - st_line_comm += indent + _('Time') + ': %s' % trans_date + ' ' + trans_hour - st_line_comm += indent + _('Transaction Type') + ': %s' % trans_type - st_line_comm += indent + _('Terminal Identification') + ': %s' % terminal_name + ', ' + terminal_city - st_line_comm += indent + _('Transaction Reference') + ': %s' % trans_reference - - if comm_type == '123': - starting_date = str2date(comm[0:6]) - maturity_date = comm[6:12] == '999999' and _('guarantee without fixed term') or str2date(comm[0:6]) - basic_amount = list2float(comm[12:27]) - percent = number2float(comm[27:39], 8) - term = comm[39:43].lstrip('0') - minimum = comm[43] == '1' and True or False - guarantee_number = comm[44:57].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Starting Date') + ': %s' % starting_date - st_line_comm += indent + _('Maturity Date') + ': %s' % maturity_date - st_line_comm += indent + _('Basic Amount') + ': %.2f' % basic_amount - st_line_comm += indent + _('Percentage') + ': %.4f' % percent - st_line_comm += indent + _('Term in days') + ': %s' % term - st_line_comm += indent + (minimum and _('Minimum applicable') or _('Minimum not applicable')) - st_line_comm += indent + _('Guarantee Number') + ': %s' % guarantee_number - - if comm_type == '124': - card_issuers = { - '1': 'Mastercard', - '2': 'Visa', - '3': 'American Express', - '4': 'Diners Club', - '9': _('Other')} - st_line_name = _('Settlement credit cards') - card_number = comm[0:20].strip() - card_issuer = card_issuers.get(comm[20], '') - invoice_number = comm[21:33].strip() - identification_number = comm[33:48].strip() - date = comm[48:54].strip() and str2date(comm[48:54]) or '' - st_line_comm = '\n' + indent + st_line_name + indent + _('Card Number') + ': %s' % card_number - st_line_comm += indent + _('Issuing Institution') + ': %s' % card_issuer - st_line_comm += indent + _('Invoice Number') + ': %s' % invoice_number - st_line_comm += indent + _('Identification Number') + ': %s' % identification_number - st_line_comm += indent + _('Date') + ': %s' % date - - if comm_type == '125': - if line['trans_family'] not in st_line_name_families: - st_line_name = _('Credit') - credit_account = comm[0:27].strip() - if check_bban('BE', credit_account): - credit_account = '-'.join([credit_account[:3], credit_account[3:10], credit_account[10:]]) - old_balance = list2float(comm[27:42]) - new_balance = list2float(comm[42:57]) - amount = list2float(comm[57:72]) - currency = comm[72:75] - start_date = str2date(comm[75:81]) - end_date = str2date(comm[81:87]) - rate = number2float(comm[87:99], 8) - trans_reference = comm[99:112].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Credit Account Number') + ': %s' % credit_account - st_line_comm += indent + _('Old Balance') + ': %.2f' % old_balance - st_line_comm += indent + _('New Balance') + ': %.2f' % new_balance - st_line_comm += indent + _('Amount') + ': %.2f' % amount - st_line_comm += indent + _('Currency') + ': %s' % currency - st_line_comm += indent + _('Starting Date') + ': %s' % start_date - st_line_comm += indent + _('End Date') + ': %s' % end_date - st_line_comm += indent + _('Nominal Interest Rate or Rate of Charge') + ': %.4f' % rate - st_line_comm += indent + _('Transaction Reference') + ': %s' % trans_reference - - if comm_type == '127': - direct_debit_types = { - '0': _('unspecified'), - '1': _('recurrent'), - '2': _('one-off'), - '3': _('1-st (recurrent)'), - '4': _('last (recurrent)')} - direct_debit_schemes = { - '0': _('unspecified'), - '1': _('SEPA core'), - '2': _('SEPA B2B')} - paid_refusals = { - '0': _('paid'), - '1': _('technical problem'), - '2': _('refusal - reason not specified'), - '3': _('debtor disagrees'), - '4': _('debtor\'s account problem')} - R_types = { - '0': _('paid'), - '1': _('reject'), - '2': _('return'), - '3': _('refund'), - '4': _('reversal'), - '5': _('cancellation')} - st_line_name = _('European direct debit (SEPA)') - settlement_date = str2date(comm[0:6]) - direct_debit_type = direct_debit_types.get(comm[6], '') - direct_debit_scheme = direct_debit_schemes.get(comm[7], '') - paid_refusal = paid_refusals.get(comm[8], '') - creditor_id = comm[9:44].strip() - mandate_ref = comm[44:79].strip() - comm_zone = comm[79:141] - R_type = R_types.get(comm[141], '') - reason = comm[142:146].strip() - st_line_comm = '\n' + indent + st_line_name + indent + _('Settlement_Date') + ': %s' % settlement_date - st_line_comm += indent + _('Direct Debit Type') + ': %s' % direct_debit_type - st_line_comm += indent + _('Direct Debit Scheme') + ': %s' % direct_debit_scheme - st_line_comm += indent + _('Paid or reason for refusal') + ': %s' % paid_refusal - st_line_comm += indent + _('Creditor\'s Identification Code') + ': %s' % creditor_id - st_line_comm += indent + _('Mandate Reference') + ': %s' % mandate_ref - st_line_comm += indent + _('Communication') + ': %s' % comm_zone - st_line_comm += indent + _('R transaction Type') + ': %s' % R_type - st_line_comm += indent + _('Reason') + ': %s' % reason - - return st_line_name, st_line_comm - - -def parse_comm_info(self, cr, uid, line, comm_type_table, context): - comm_type = line['struct_comm_type'] - comm = st_line_comm = line['communication'] - st_line_name = line['name'] - - if comm_type == '001': - st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] - st_line_comm = '\n' + indent + st_line_name + indent + _('Name') + ': %s' % comm[0:70].strip() - st_line_comm += indent + _('Street') + ': %s' % comm[70:105].strip() - st_line_comm += indent + _('Locality') + ': %s' % comm[105:140].strip() - st_line_comm += indent + _('Identification Code') + ': %s' % comm[140:175].strip() - - if comm_type in ['002', '004', '005']: - st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] - st_line_comm = comm.strip() - - if comm_type == '006': - amount = (comm[48] == '1' and '-' or '') + ('%.2f' % list2float(comm[33:48])) + ' ' + comm[30:33] - st_line_name = filter(lambda x: comm_type == x['code'], comm_type_table)[0]['description'] - st_line_comm = '\n' + indent + st_line_name + indent + _('Description of the detail') + ': %s' % comm[0:30].strip() - st_line_comm += indent + _('Amount') + ': %s' % amount - st_line_comm += indent + _('Category') + ': %s' % comm[49:52].strip() - - if comm_type not in ['001', '002', '004', '005', '006']: - _logger.warn('The parsing of Structured Commmunication Type %s has not yet been implemented. ' \ - 'Please contact Noviat (info@noviat.be) for more information about the development roadmap', comm_type) - - return st_line_name, st_line_comm # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/wizard/account_coda_import_dle.py b/addons/l10n_be_coda/wizard/account_coda_import_dle.py deleted file mode 100644 index 432008fa58e..00000000000 --- a/addons/l10n_be_coda/wizard/account_coda_import_dle.py +++ /dev/null @@ -1,740 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# -# Copyright (c) 2012 Noviat nv/sa (www.noviat.be). All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import base64 -from osv import fields, osv -from tools.translate import _ -import time -import tools -import logging -_logger = logging.getLogger(__name__) - - -class account_coda_import(osv.osv_memory): - _name = 'account.coda.import' - _description = 'Import CODA File' - _columns = { - 'coda_data': fields.binary('CODA File', required=True), - 'coda_fname': fields.char('CODA Filename', size=128, required=True), - 'note': fields.text('Log'), - } - _defaults = { - 'coda_fname': lambda *a: '', - } - - def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None): - if context is None: - context = {} - if batch: - print - codafile = str(codafile) - codafilename = codafilename - else: - data = self.browse(cr, uid, ids)[0] - try: - codafile = data.coda_data - codafilename = data.coda_fname - except: - raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) - return {} - recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') - statements = [] - for line in recordlist: - if not line: - pass - elif line[0] == '0': - #Begin of a new Bank statement - statement = {} - statements.append(statement) - statement['version'] = line[127] - if statement['version'] not in ['1', '2']: - raise osv.except_osv(_('Error R001!'), _('CODA V%s statements are not supported, please contact your bank!') % statement['version']) - statement['globalisation_stack'] = [] - statement['lines'] = [] - statement['date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[5:11]), '%d%m%y')) - statement['separateApplication'] = rmspaces(line[83:88]) - elif line[0] == '1': - #Statement details - if statement['version'] == '1': - statement['accountNumber'] = rmspaces(line[5:17]) - statement['currency'] = rmspaces(line[18:21]) - elif statement['version'] == '2': - if line[1] == '0': # Belgian bank account BBAN structure - statement['accountNumber'] = rmspaces(line[5:17]) - statement['currency'] = rmspaces(line[18:21]) - elif line[1] == '1': # foreign bank account BBAN structure - raise osv.except_osv(_('Error R1001!'), _('Foreign bank accounts with BBAN structure are not supported !')) - elif line[1] == '2': # Belgian bank account IBAN structure - statement['accountNumber'] = rmspaces(line[5:21]) - statement['currency'] = rmspaces(line[39:42]) - elif line[1] == '3': # foreign bank account IBAN structure - raise osv.except_osv(_('Error R1002!'), _('Foreign bank accounts with IBAN structure are not supported !')) - else: # Something else, not supported - raise osv.except_osv(_('Error R1003!'), _('\nUnsupported bank account structure !')) - statement['description'] = rmspaces(line[90:125]) - statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 - statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) - statement['accountHolder'] = rmspaces(line[64:90]) - statement['paperSeqNumber'] = rmspaces(line[2:5]) - statement['codaSeqNumber'] = rmspaces(line[125:128]) - elif line[0] == '2': - if line[1] == '1': - #New statement line - statementLine = {} - statementLine['type'] = 'general' - statementLine['ref'] = rmspaces(line[2:10]) - statementLine['ref_move'] = rmspaces(line[2:6]) - statementLine['ref_move_detail'] = rmspaces(line[6:10]) - statementLine['sequence'] = len(statement['lines']) + 1 - statementLine['transactionRef'] = rmspaces(line[10:31]) - statementLine['debit'] = line[31] # 0 = Credit, 1 = Debit - statementLine['amount'] = float(rmspaces(line[32:47])) / 1000 - if statementLine['debit'] == '1': - statementLine['amount'] = - statementLine['amount'] - statementLine['transaction_type'] = line[53] - if statementLine['transaction_type'] not in transaction_types: - raise osv.except_osv(_('Error R2001!'), _('The File contains an invalid CODA Transaction Type : %s!') % statementLine['transaction_type']) - statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) - statementLine['transaction_family'] = rmspaces(line[54:56]) - #TODO Handling severals transactions Family - statementLine['transaction_code'] = rmspaces(line[56:58]) - #TODO Handling severals transactions code - statementLine['transaction_category'] = rmspaces(line[58:61]) - #TODO Handling severals transactions category - statementLine['communication'] = rmspaces(line[62:115]) - #TODO Handling structured communication - statementLine['entryDate'] = rmspaces(line[115:121]) - statementLine['type'] = 'normal' - statementLine['globalisation'] = int(line[124]) - if len(statement['globalisation_stack']) > 0: - statementLine['communication'] = "\n".join([statement['globalisation_stack'][-1]['communication'], statementLine['communication']]) - if statementLine['globalisation'] > 0: - if len(statement['globalisation_stack']) > 0 and statement['globalisation_stack'][-1]['globalisation'] == statementLine['globalisation']: - # Destack - statement['globalisation_stack'].pop() - else: - #Stack - statementLine['type'] = 'globalisation' - statement['globalisation_stack'].append(statementLine) - statement['lines'].append(statementLine) - elif line[1] == '2': - if statement['lines'][-1]['ref'][0:4] != line[2:6]: - raise osv.except_osv(_('Error R2004!'), _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) - statement['lines'][-1]['communication'] += rmspaces(line[10:63]) - statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) - statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) - elif line[1] == '3': - if statement['lines'][-1]['ref'][0:4] != line[2:6]: - raise osv.except_osv(_('Error R2005!'), _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) - if statement['version'] == '1': - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) - statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) - statement['lines'][-1]['counterpartyCurrency'] = '' - else: - if line[22] == ' ': - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) - statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[23:26]) - else: - statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:44]) - statement['lines'][-1]['counterpartyCurrency'] = rmspaces(line[44:47]) - statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:82]) - statement['lines'][-1]['communication'] += rmspaces(line[82:125]) - else: - # movement data record 2.x (x != 1,2,3) - raise osv.except_osv(_('Error R2009!'), _('\nMovement data records of type 2.%s are not supported !') % line[1]) - elif line[0] == '3': - if line[1] == '1': - infoLine = {} - infoLine['entryDate'] = statement['lines'][-1]['entryDate'] - infoLine['type'] = 'information' - infoLine['sequence'] = len(statement['lines']) + 1 - infoLine['ref'] = rmspaces(line[2:10]) - infoLine['transactionRef'] = rmspaces(line[10:31]) - infoLine['transaction_type'] = line[31] - infoLine['transaction_family'] = rmspaces(line[32:34]) - infoLine['transaction_code'] = rmspaces(line[34:36]) - infoLine['transaction_category'] = rmspaces(line[36:39]) - infoLine['communication'] = rmspaces(line[40:113]) - infoLine['amount'] = 0.0 - infoLine['type'] = 'information' - statement['lines'].append(infoLine) - elif line[1] == '2': - if infoLine['ref'] != rmspaces(line[2:10]): - raise osv.except_osv(_('Error R3004!'), _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) - statement['lines'][-1]['communication'] += rmspaces(line[10:100]) - elif line[1] == '3': - if infoLine['ref'] != rmspaces(line[2:10]): - raise osv.except_osv(_('Error R3005!'), _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) - statement['lines'][-1]['communication'] += rmspaces(line[10:100]) - elif line[0] == '4': - comm_line = {} - comm_line['type'] = 'communication' - comm_line['sequence'] = len(statement['lines']) + 1 - comm_line['ref'] = rmspaces(line[2:10]) - comm_line['communication'] = rmspaces(line[32:112]) - comm_line['amount'] = 0.0 - comm_line['type'] = 'communication' - statement['lines'].append(comm_line) - elif line[0] == '8': - # new balance record - statement['debit'] = line[41] - statement['paperSeqNumber'] = rmspaces(line[1:4]) - statement['balance_end_real'] = float(rmspaces(line[42:57])) / 1000 - statement['balance_end_realDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[57:63]), '%d%m%y')) - if statement['debit'] == '1': # 1=Debit - statement['balance_end_real'] = - statement['balance_end_real'] - if statement['balance_end_realDate']: - period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])]) - else: - period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) - if not period_id and len(period_id) == 0: - raise osv.except_osv(_('Error R0002!'), _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate']) - statement['period_id'] = period_id[0] - elif line[0] == '9': - statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 - statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 - if not statement['balance_end_real']: - statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] - for i, statement in enumerate(statements): - # print '---STATEMENT #' + str(i) + '---' - print statement - data = { - 'name': '[' + statement['date'] + ']' + statement['description'], - 'date': statement['date'], - 'journal_id': 18, - 'period_id': statement['period_id'], - 'balance_start': statement['balance_start'], - 'balance_end_real': statement['balance_end_real'], - 'account_id': 1 - } - statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) - for line in statement['lines']: - if line['type'] == 'normal': - counterparty = [] - if 'counterpartyName' in line: - counterparty.append(line['counterpartyName']) - if 'counterpartyNumber' in line: - counterparty.append(line['counterpartyNumber']) - if len(counterparty) > 0: - counterparty = '[' + ' / '.join(counterparty) + ']' - else: - counterparty = '/' - if line['transaction_type'] in transaction_types: - line['transaction_type'] = transaction_types[line['transaction_type']][1] - if line['transaction_category'] in transaction_categories: - line['transaction_category'] = transaction_categories[line['transaction_category']] - if line['transaction_family'] in transaction_codes: - transaction_family = transaction_codes[line['transaction_family']] - line['transaction_family'] = transaction_family[0] - if line['transaction_code'] in transaction_family[1]: - line['transaction_code'] = transaction_family[1][line['transaction_code']] - note = [] - note.append(_('Counter Party') + ': ' + counterparty) - note.append(_('Communication') + ': ' + line['communication']) - note.append(_('Transaction type') + ': ' + line['transaction_type']) - note.append(_('Transaction family') + ': ' + line['transaction_family']) - note.append(_('Transaction code') + ': ' + line['transaction_code']) - note.append(_('Transaction category') + ': ' + line['transaction_category']) - - try: - if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: - line['counterpartyNumber'] = False - except: - pass - if 'counterpartyNumber' in line and line['counterpartyNumber']: - ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) - if ids and len(ids) > 0: - partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0],context=context).partner_id.id - else: - partner_id = None - - data = { - 'name': line['communication'], - 'note': "\n".join(note), - 'date': line['entryDate'], - 'amount': line['amount'], - # 'type': '', - 'partner_id': partner_id, - 'account_id': 1, - 'statement_id': statement['id'], - # 'analytic_account_id': '', - # 'move_ids': '', - 'ref': line['ref'], - 'sequence': line['sequence'], - } - self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) - -account_coda_import() - -transaction_types = { - "0": ["", _("Simple amount without detailed data; e.g. : an individual credit transfer [free of charges].")], - "1": ["", _("Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is ]debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following [type 5].")], - "5": ["1", _("Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record [type 1].")], - "2": ["", _("Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data [type 6 or 7] is following.")], - "6": ["2", _("Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6.")], - "7": ["2", _("Detail of 2. Simple account with detailed data The records in a separate application keep type 7.")], - "9": ["7", _("Detail of 7. The records in a separate application keep type 9.")], - "3": ["", _("Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers.")], - "8": ["3", _("Detail of 3.")], -} - -transaction_codes = { - "00": [_("Undefined transactions"), { - "89": _("Cancellation of a transaction"), - "87": _("Costs refunded"), - "85": _("Correction"), - "83": _("Value correction"), - "39": _("Cancellation of a transaction"), - "37": _("Costs"), - "35": _("Correction"), - "33": _("Value correction"), - "00": _("Undefined transaction") - }], - "01": [_("Domestic or local SEPA credit transfers"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "66": _("Financial centralization"), - "64": _("Transfer to your account"), - "62": _("Unpaid postal order"), - "60": _("Non-presented circular cheque"), - "54": _("Unexecutable transfer order"), - "52": _("Payment in your favour"), - "51": _("Transfer in your favour – initiated by the bank"), - "50": _("Transfer in your favour"), - "49": _("Cancellation or correction"), - "39": _("Your issue circular cheque"), - "37": _("Costs"), - "17": _("Financial centralisation"), - "15": _("Balance due insurance premium"), - "13": _("Transfer from your account"), - "11": _("Your semi-standing order – payment to employees"), - "09": _("Your semi-standing order"), - "07": _("Collective transfer"), - "05": _("Payment of wages etc."), - "03": _("Standing order"), - "02": _("Individual transfer order initiated by the bank"), - "01": _("Individual transfer order]"), - }], - "03": [_("Cheques"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of cheque-related costs"), - "68": _("Credit of a payment via electronic purse"), - "66": _("Remittance of cheque by your branch - credit under usual reserve"), - "64": _("Reversal of settlement of credit card"), - "63": _("Second credit of unpaid cheque"), - "62": _("Reversal of cheque"), - "60": _("Reversal of voucher"), - "58": _("Remittance of cheques, vouchers, etc. credit after collection"), - "56": _("Non-presented certified cheques"), - "52": _("First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve"), - "50": _("Credit of a payment via terminal"), - "49": _("Cancellation or correction"), - "39": _("Provisionally unpaid due to other reason than manual presentation"), - "38": _("Provisionally unpaid"), - "37": _("Cheque-related costs"), - "35": _("Cash advance"), - "19": _("Settlement of credit cards"), - "17": _("Your certified cheque"), - "15": _("Your purchase bank cheque"), - "13": _("Eurocheque written out abroad"), - "11": _("Department store cheque"), - "09": _("Unpaid voucher"), - "07": _("Definitely unpaid cheque"), - "05": _("Payment of voucher"), - "03": _("Your purchase by payment card"), - "01": _("Payment of your cheque"), - }], - "04": [_("Cards"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "68": _("Credit after Proton payments"), - "55": _("Income from payments by GSM"), - "53": _("Cash deposit at an ATM"), - "52": _("Loading GSM cards"), - "51": _("Unloading Proton"), - "50": _("Credit after a payment at a terminal"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "08": _("Payment by means of a payment card outside the Eurozone"), - "07": _("Payment by GSM"), - "06": _("Payment with tank card"), - "05": _("Loading Proton"), - "04": _("Cash withdrawal from an ATM"), - "03": _("Settlement credit cards"), - "02": _("Payment by means of a payment card within the Eurozone"), - "01": _("Loading a GSM card"), - }], - "05": [_("Direct debit"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "58": _("Reversal"), - "56": _("Unexecutable reimbursement"), - "54": _("Reimbursement"), - "52": _("Credit under usual reserve"), - "50": _("Credit after collection"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "05": _("Reimbursement"), - "03": _("Unpaid debt"), - "01": _("Payment"), - }], - "07": [_("Domestic commercial paper"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "86": _("Payment after cession"), - "64": _("Warrant"), - "58": _("Remittance of supplier's bill without guarantee"), - "56": _("Remittance of supplier's bill with guarantee"), - "54": _("Remittance of commercial paper for discount"), - "52": _("Remittance of commercial paper - credit under usual reserve"), - "50": _("Remittance of commercial paper - credit after collection"), - "49": _("Cancellation or correction"), - "39": _("Return of an irregular bill of exchange"), - "37": _("Costs related to commercial paper"), - "14": _("Warrant fallen due"), - "12": _("Safe custody"), - "10": _("Renewal of agreed maturity date"), - "09": _("Agio on supplier's bill"), - "08": _("Payment in advance"), - "07": _("Unpaid commercial paper"), - "06": _("Extension of maturity date"), - "05": _("Commercial paper claimed back"), - "03": _("Payment receipt card"), - "01": _("Payment commercial paper"), - }], - "09": [_("Counter transactions"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Sale of traveller’s cheque"), - "68": _("Difference in payment"), - "66": _("Repurchase of petrol coupons"), - "64": _("Your winning lottery ticket"), - "62": _("Sale of gold/pieces under usual reserve"), - "60": _("Sale of foreign bank notes"), - "58": _("Payment by your branch/agents"), - "56": _("Reserve"), - "54": _("Your payment ATM"), - "52": _("Payment night safe"), - "50": _("Cash payment"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "25": _("Purchase of traveller’s cheque"), - "21": _("Cash withdrawal on card (PROTON)"), - "19": _("Difference in payment"), - "17": _("Purchase of fiscal stamps"), - "15": _("Your purchase of lottery tickets"), - "13": _("Cash withdrawal by your branch or agents"), - "11": _("Your purchase of luncheon vouchers"), - "09": _("Purchase of petrol coupons"), - "07": _("Purchase of gold/pieces"), - "05": _("Purchase of foreign bank notes"), - "03": _("Cash withdrawal by card (ATM)"), - "01": _("Cash withdrawal"), - }], - "11": [_("Securities"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Settlement of securities"), - "68": _("Compensation for missing coupon"), - "66": _("Retrocession of issue commission"), - "64": _("Your issue"), - "62": _("Interim interest on subscription"), - "58": _("Repayable securities from a deposit or delivered at the counter - credit under usual reserve"), - "56": _("Reserve"), - "52": _("Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve"), - "51": _("Tender"), - "50": _("Sale of securities"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "19": _("Regularisation costs"), - "17": _("Management fee"), - "15": _("Interim interest on subscription"), - "13": _("Your repurchase of issue"), - "11": _("Payable coupons/repayable securities"), - "09": _("Settlement of securities"), - "06": _("Share option plan – exercising an option"), - "05": _("Partial payment subscription"), - "04": _("Issues"), - "03": _("Subscription to securities"), - "02": _("Tenders"), - "01": _("Purchase of securities"), - }], - "13": [_("Credit"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Settlement of discount bank acceptance"), - "68": _("Documentary export credits"), - "62": _("Term loan"), - "60": _("Settlement of mortgage loan"), - "56": _("Subsidy"), - "55": _("Fixed advance – interest only"), - "54": _("Fixed advance – capital and interest"), - "50": _("Settlement of instalment credit"), - "49": _("Cancellation or correction"), - "37": _("Credit-related costs"), - "21": _("Other credit applications"), - "19": _("Documentary import credits"), - "15": _("Your repayment hire-purchase and similar claims"), - "13": _("Settlement of bank acceptances"), - "11": _("Your repayment mortgage loan"), - "07": _("Your repayment instalment credits"), - "05": _("Settlement of fixed advance"), - "02": _("Long-term loan"), - "01": _("Short-term loan"), - }], - "30": [_("Various transactions"), { - "99": _("Cancellation or correction"), - "89": _("Undefined transaction"), - "87": _("Reimbursement of costs"), - "83": _("Value (date) correction"), - "55": _("Interest term investment"), - "54": _("Capital and/or interest term investment"), - "52": _("Forward sale of foreign exchange"), - "50": _("Spot sale of foreign exchange"), - "49": _("Cancellation or correction"), - "39": _("Undefined transaction"), - "37": _("Costs"), - "33": _("Value (date) correction"), - "05": _("Capital and/or interest term investment"), - "03": _("Forward purchase of foreign exchange"), - "01": _("Spot purchase of foreign exchange"), - }], - "35": [_("Closing (periodical settlements for interest, costs,…)"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "50": _("Closing"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "01": _("Closing"), - }], - "41": [_("International credit transfers - non-SEPA credit transfers"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "66": _("Financial centralisation (credit)"), - "64": _("Transfer to your account"), - "50": _("Transfer"), - "49": _("Cancellation or correction"), - "38": _("Costs relating to incoming foreign and non-SEPA transfers"), - "37": _("Costs relating to outgoing foreign transfers and non-SEPA transfers"), - "17": _("Financial centralisation (debit)"), - "13": _("Transfer from your account"), - "07": _("Collective transfers"), - "05": _("Collective payments of wages"), - "03": _("Standing order"), - "01": _("Transfer"), - }], - "43": [_("Foreign cheques"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Purchase of traveller’s cheque"), - "62": _("Reversal of cheques"), - "58": _("Remittance of foreign cheque credit after collection"), - "52": _("Remittance of foreign cheque credit under usual reserve"), - "49": _("Cancellation or correction"), - "37": _("Costs relating to payment of foreign cheques"), - "15": _("Purchase of an international bank cheque"), - "07": _("Unpaid foreign cheque"), - "01": _("Payment of a foreign cheque"), - }], - "47": [_("Foreign commercial paper"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "64": _("Warrant"), - "62": _("Remittance of documents abroad - credit after collection"), - "60": _("Remittance of documents abroad - credit under usual reserve"), - "58": _("Idem without guarantee"), - "56": _("Remittance of guaranteed foreign supplier's bill"), - "54": _("Discount abroad"), - "52": _("Remittance of foreign bill credit under usual reserve"), - "50": _("Remittance of foreign bill credit after collection"), - "49": _("Cancellation or correction"), - "37": _("Costs relating to the payment of a foreign bill"), - "14": _("Warrant fallen due"), - "13": _("Discount foreign supplier's bills"), - "11": _("Payment documents abroad"), - "07": _("Unpaid foreign bill"), - "06": _("Extension"), - "05": _("Bill claimed back"), - "01": _("Payment of foreign bill"), - }], - "49": [_("Foreign counter transactions"), {"03": _("ATM withdrawal")}], - "80": [_("Separately charged costs and provisions"), { - "01": _("Guarantee card charges"), - "02": _("Costs relating to electronic output"), - "03": _("Payment card charges"), - "04": _("Costs for holding a documentary cash credit"), - "05": _("Card charges"), - "06": _("Damage relating to bills and cheques"), - "07": _("Insurance costs"), - "08": _("Registering compensation for savings accounts"), - "09": _("Postage"), - "10": _("Purchase of Smartcard"), - "11": _("Costs for the safe custody of correspondence"), - "12": _("Costs for opening a bank guarantee"), - "13": _("Renting of safes"), - "14": _("Handling costs instalment credit"), - "15": _("Night safe"), - "16": _("Bank confirmation to revisor or accountant"), - "17": _("Charge for safe custody"), - "18": _("Trade information"), - "19": _("Special charge for safe custody"), - "20": _("Drawing up a certificate"), - "21": _("Pay-packet charges"), - "22": _("Management/custody"), - "23": _("Research costs"), - "24": _("Participation in and management of interest refund system"), - "25": _("Renting of direct debit box"), - "26": _("Travel insurance premium"), - "27": _("Subscription fee"), - "29": _("Information charges"), - "31": _("Writ service fee"), - "33": _("Miscellaneous fees and commissions"), - "35": _("Costs"), - "37": _("Access right to database"), - "39": _("Surety fee"), - "41": _("Research costs"), - "43": _("Printing of forms"), - "45": _("Documentary credit charges"), - "47": _("Charging fees for transactions"), - "49": _("Cancellation or correction"), - "99": _("Cancellation or correction"), - }], -} - -transaction_categories = { - "000": _("Net amount"), - "001": _("Interest received"), - "002": _("Interest paid"), - "003": _("Credit commission"), - "004": _("Postage"), - "005": _("Renting of letterbox"), - "006": _("Various fees/commissions"), - "007": _("Access right to database"), - "008": _("Information charges"), - "009": _("Travelling expenses"), - "010": _("Writ service fee"), - "011": _("VAT"), - "012": _("Exchange commission"), - "013": _("Payment commission"), - "014": _("Collection commission"), - "015": _("Correspondent charges"), - "016": _("BLIW/IBLC dues"), - "017": _("Research costs"), - "018": _("Tental guarantee charges"), - "019": _("Tax on physical delivery"), - "020": _("Costs of physical delivery"), - "021": _("Costs for drawing up a bank cheque"), - "022": _("Priority costs"), - "023": _("Exercising fee"), - "024": _("Growth premium"), - "025": _("Individual entry for exchange charges"), - "026": _("Handling commission"), - "027": _("Charges for unpaid bills"), - "028": _("Fidelity premium"), - "029": _("Protest charges"), - "030": _("Account insurance"), - "031": _("Charges foreign cheque"), - "032": _("Drawing up a circular cheque"), - "033": _("Charges for a foreign bill"), - "034": _("Reinvestment fee"), - "035": _("Charges foreign documentary bill"), - "036": _("Costs relating to a refused cheque"), - "037": _("Commission for handling charges"), - "039": _("Telecommunications"), - "041": _("Credit card costs"), - "042": _("Payment card costs"), - "043": _("Insurance costs"), - "045": _("Handling costs"), - "047": _("Charges extension bill"), - "049": _("Fiscal stamps/stamp duty"), - "050": _("Capital term investment"), - "051": _("Withholding tax"), - "052": _("Residence state tax"), - "053": _("Printing of forms"), - "055": _("Repayment loan or credit capital"), - "057": _("Interest subsidy"), - "058": _("Capital premium"), - "059": _("Default interest"), - "061": _("Charging fees for transactions"), - "063": _("Rounding differences"), - "065": _("Interest payment advice"), - "066": _("Fixed loan advance - reimbursement"), - "067": _("Fixed loan advance - extension"), - "068": _("Countervalue of an entry"), - "069": _("Forward arbitrage contracts : sum to be supplied by customer"), - "070": _("Forward arbitrage contracts : sum to be supplied by bank"), - "071": _("Fixed loan advance - availability"), - "072": _("Countervalue of commission to third party"), - "073": _("Costs of ATM abroad"), - "074": _("Mailing costs"), - "100": _("Gross amount"), - "200": _("Overall documentary credit charges"), - "201": _("Advice notice commission"), - "202": _("Advising commission | Additional advising commission"), - "203": _("Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission"), - "204": _("Amendment fee"), - "205": _("Documentary payment commission | Document commission | Drawdown fee | Negotiation fee"), - "206": _("Surety fee/payment under reserve"), - "207": _("Non-conformity fee"), - "208": _("Commitment fee deferred payment"), - "209": _("Transfer commission"), - "210": _("Commitment fee"), - "211": _("Credit arrangement fee | Additional credit arrangement fee"), - "212": _("Warehousing fee"), - "213": _("Financing fee"), - "214": _("Issue commission (delivery order)"), - "400": _("Acceptance fee"), - "401": _("Visa charges"), - "402": _("Certification costs"), - "403": _("Minimum discount rate"), - "404": _("Discount commission"), - "405": _("Bill guarantee commission"), - "406": _("Collection charges"), - "407": _("Costs Article 45"), - "408": _("Cover commission"), - "409": _("Safe deposit charges"), - "410": _("Reclamation charges"), - "411": _("Fixed collection charge"), - "412": _("Advice of expiry charges"), - "413": _("Acceptance charges"), - "414": _("Regularisation charges"), - "415": _("Surety fee"), - "416": _("Charges for the deposit of security"), - "418": _("Endorsement commission"), - "419": _("Bank service fee"), - "420": _("Retention charges"), - "425": _("Foreign broker's commission"), - "426": _("Belgian broker's commission"), - "427": _("Belgian Stock Exchange tax"), - "428": _("Interest accrued"), - "429": _("Foreign Stock Exchange tax"), - "430": _("Recovery of foreign tax"), - "431": _("Delivery of a copy"), -} - - -def rmspaces(s): - return " ".join(s.split()) - - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 819a8f3887ed5ba29930ce40131e4a83648694c9 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Wed, 5 Dec 2012 19:02:02 +0100 Subject: [PATCH 09/32] [FIX]name missing in tree bank statement line bzr revid: dle@openerp.com-20121205180202-amy4yrqotuu0ta5e --- addons/account/account_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 562c1ad6fa1..235ded29094 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -574,6 +574,7 @@ + From 28b988940f65d2e114442cfbe57a27a1bac83252 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Wed, 5 Dec 2012 20:21:43 +0100 Subject: [PATCH 10/32] [FIX]Removing _(translate) from transaction code, family, categories + Matching bank account number bzr revid: dle@openerp.com-20121205192143-9qxazjf743z42ycw --- .../wizard/account_coda_import.py | 898 +++++++++--------- 1 file changed, 450 insertions(+), 448 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 0bde26e1f44..2286caf8f68 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -45,7 +45,6 @@ class account_coda_import(osv.osv_memory): if context is None: context = {} if batch: - print codafile = str(codafile) codafilename = codafilename else: @@ -54,7 +53,7 @@ class account_coda_import(osv.osv_memory): codafile = data.coda_data codafilename = data.coda_fname except: - raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!')) + raise osv.except_osv(_('Error'), _('Wizard in incorrect state. Please hit the Cancel button')) return {} recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n') statements = [] @@ -67,7 +66,7 @@ class account_coda_import(osv.osv_memory): statements.append(statement) statement['version'] = line[127] if statement['version'] not in ['1', '2']: - raise osv.except_osv(_('Error R001!'), _('CODA V%s statements are not supported, please contact your bank!') % statement['version']) + raise osv.except_osv(_('Error') + 'R001', _('CODA V%s statements are not supported, please contact your bank') % statement['version']) statement['globalisation_stack'] = [] statement['lines'] = [] statement['date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[5:11]), '%d%m%y')) @@ -75,21 +74,31 @@ class account_coda_import(osv.osv_memory): elif line[0] == '1': #Statement details if statement['version'] == '1': - statement['accountNumber'] = rmspaces(line[5:17]) + statement['acc_number'] = rmspaces(line[5:17]) statement['currency'] = rmspaces(line[18:21]) elif statement['version'] == '2': if line[1] == '0': # Belgian bank account BBAN structure - statement['accountNumber'] = rmspaces(line[5:17]) + statement['acc_number'] = rmspaces(line[5:17]) statement['currency'] = rmspaces(line[18:21]) elif line[1] == '1': # foreign bank account BBAN structure - raise osv.except_osv(_('Error R1001!'), _('Foreign bank accounts with BBAN structure are not supported !')) + raise osv.except_osv(_('Error') + 'R1001', _('Foreign bank accounts with BBAN structure are not supported ')) elif line[1] == '2': # Belgian bank account IBAN structure - statement['accountNumber'] = rmspaces(line[5:21]) + statement['acc_number'] = rmspaces(line[5:21]) statement['currency'] = rmspaces(line[39:42]) elif line[1] == '3': # foreign bank account IBAN structure - raise osv.except_osv(_('Error R1002!'), _('Foreign bank accounts with IBAN structure are not supported !')) + raise osv.except_osv(_('Error') + 'R1002', _('Foreign bank accounts with IBAN structure are not supported ')) else: # Something else, not supported - raise osv.except_osv(_('Error R1003!'), _('Unsupported bank account structure !')) + raise osv.except_osv(_('Error') + 'R1003', _('Unsupported bank account structure ')) + ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', statement['acc_number'])]) + not_found_except = osv.except_osv(_('Error') + 'R1004', _("No matching CODA Bank Account Configuration record found. Please check if the 'Bank Account Number' and 'Currency' fields of your configuration record match with '%s' and '%s'.") % (statement['acc_number'], statement['currency'])) + if ids and len(ids) > 0: + bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, ids) + for bank_acc in bank_accs: + statement['journal_id'] = bank_acc.journal_id + if (statement['journal_id'].currency and statement['journal_id'].currency.name != statement['currency']) and (not statement['journal_id'].currency and statement['journal_id'].company_id.currency_id.name != statement['currency']): + raise not_found_except + else: + raise not_found_except statement['description'] = rmspaces(line[90:125]) statement['balance_start'] = float(rmspaces(line[43:58])) / 1000 statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y')) @@ -112,16 +121,12 @@ class account_coda_import(osv.osv_memory): statementLine['amount'] = - statementLine['amount'] statementLine['transaction_type'] = line[53] if statementLine['transaction_type'] not in transaction_types: - raise osv.except_osv(_('Error R2001!'), _('The File contains an invalid CODA Transaction Type : %s!') % statementLine['transaction_type']) + raise osv.except_osv(_('Error') + 'R2001', _('The File contains an invalid CODA Transaction Type : %s') % statementLine['transaction_type']) statementLine['transactionDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[47:53]), '%d%m%y')) statementLine['transaction_family'] = rmspaces(line[54:56]) - #TODO Handling severals transactions Family statementLine['transaction_code'] = rmspaces(line[56:58]) - #TODO Handling severals transactions code statementLine['transaction_category'] = rmspaces(line[58:61]) - #TODO Handling severals transactions category statementLine['communication'] = rmspaces(line[62:115]) - #TODO Handling structured communication statementLine['entryDate'] = rmspaces(line[115:121]) statementLine['type'] = 'normal' statementLine['globalisation'] = int(line[124]) @@ -138,13 +143,13 @@ class account_coda_import(osv.osv_memory): statement['lines'].append(statementLine) elif line[1] == '2': if statement['lines'][-1]['ref'][0:4] != line[2:6]: - raise osv.except_osv(_('Error R2004!'), _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + raise osv.except_osv(_('Error') + 'R2004', _('CODA parsing error on movement data record 2.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) statement['lines'][-1]['communication'] += rmspaces(line[10:63]) statement['lines'][-1]['payment_reference'] = rmspaces(line[63:98]) statement['lines'][-1]['counterparty_bic'] = rmspaces(line[98:109]) elif line[1] == '3': if statement['lines'][-1]['ref'][0:4] != line[2:6]: - raise osv.except_osv(_('Error R2005!'), _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + raise osv.except_osv(_('Error') + 'R2005', _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) if statement['version'] == '1': statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) @@ -160,7 +165,7 @@ class account_coda_import(osv.osv_memory): statement['lines'][-1]['communication'] += rmspaces(line[82:125]) else: # movement data record 2.x (x != 1,2,3) - raise osv.except_osv(_('Error R2009!'), _('\nMovement data records of type 2.%s are not supported !') % line[1]) + raise osv.except_osv(_('Error') + 'R2006', _('\nMovement data records of type 2.%s are not supported ') % line[1]) elif line[0] == '3': if line[1] == '1': infoLine = {} @@ -179,11 +184,11 @@ class account_coda_import(osv.osv_memory): statement['lines'].append(infoLine) elif line[1] == '2': if infoLine['ref'] != rmspaces(line[2:10]): - raise osv.except_osv(_('Error R3004!'), _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + raise osv.except_osv(_('Error') + 'R3004', _('CODA parsing error on information data record 3.2, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) statement['lines'][-1]['communication'] += rmspaces(line[10:100]) elif line[1] == '3': if infoLine['ref'] != rmspaces(line[2:10]): - raise osv.except_osv(_('Error R3005!'), _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) + raise osv.except_osv(_('Error') + 'R3005', _('CODA parsing error on information data record 3.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) statement['lines'][-1]['communication'] += rmspaces(line[10:100]) elif line[0] == '4': comm_line = {} @@ -207,7 +212,7 @@ class account_coda_import(osv.osv_memory): else: period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])]) if not period_id and len(period_id) == 0: - raise osv.except_osv(_('Error R0002!'), _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate']) + raise osv.except_osv(_('Error') + 'R0002', _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate']) statement['period_id'] = period_id[0] elif line[0] == '9': statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 @@ -215,16 +220,13 @@ class account_coda_import(osv.osv_memory): if not statement['balance_end_real']: statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): - # print '---STATEMENT #' + str(i) + '---' - print statement data = { 'name': '[' + statement['date'] + ']' + statement['description'], 'date': statement['date'], - 'journal_id': 18, + 'journal_id': statement['journal_id'].id, 'period_id': statement['period_id'], 'balance_start': statement['balance_start'], 'balance_end_real': statement['balance_end_real'], - 'account_id': 1 } statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) for line in statement['lines']: @@ -264,7 +266,7 @@ class account_coda_import(osv.osv_memory): if 'counterpartyNumber' in line and line['counterpartyNumber']: ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) if ids and len(ids) > 0: - partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0],context=context).partner_id.id + partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id.id else: partner_id = None @@ -275,7 +277,7 @@ class account_coda_import(osv.osv_memory): 'amount': line['amount'], # 'type': '', 'partner_id': partner_id, - 'account_id': 1, + 'account_id': 1, # TODO 'statement_id': statement['id'], # 'analytic_account_id': '', # 'move_ids': '', @@ -287,449 +289,449 @@ class account_coda_import(osv.osv_memory): account_coda_import() transaction_types = { - "0": ["", _("Simple amount without detailed data; e.g. : an individual credit transfer [free of charges].")], - "1": ["", _("Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is ]debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following [type 5].")], - "5": ["1", _("Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record [type 1].")], - "2": ["", _("Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data [type 6 or 7] is following.")], - "6": ["2", _("Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6.")], - "7": ["2", _("Detail of 2. Simple account with detailed data The records in a separate application keep type 7.")], - "9": ["7", _("Detail of 7. The records in a separate application keep type 9.")], - "3": ["", _("Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers.")], - "8": ["3", _("Detail of 3.")], + "0": ["", "Simple amount without detailed data; e.g. : an individual credit transfer [free of charges]."], + "1": ["", "Amount as totalised by the customer; e.g. a file regrouping payments of wages or payments made to suppliers or a file regrouping collections for which the customer is ]debited or credited with one single amount. As a matter of principle, this type is also used when no detailed data is following [type 5]."], + "5": ["1", "Detail of 1. Standard procedure is no detailing. However, the customer may ask for detailed data to be included into his file after the overall record [type 1]."], + "2": ["", "Amount as totalised by the bank; e.g. : the total amount of a series of credit transfers with a structured communication As a matter of principle, this type will also be used when no detailed data [type 6 or 7] is following."], + "6": ["2", "Detail of 2. Simple amount without detailed data. Normally, data of this kind comes after type 2. The customer may ask for a separate file containing the detailed data. In that case, one will speak of a ‘separate application’. The records in a separate application keep type 6."], + "7": ["2", "Detail of 2. Simple account with detailed data The records in a separate application keep type 7."], + "9": ["7", "Detail of 7. The records in a separate application keep type 9."], + "3": ["", "Simple amount with detailed data; e.g. in case of charges for cross-border credit transfers."], + "8": ["3", "Detail of 3."], } transaction_codes = { - "00": [_("Undefined transactions"), { - "89": _("Cancellation of a transaction"), - "87": _("Costs refunded"), - "85": _("Correction"), - "83": _("Value correction"), - "39": _("Cancellation of a transaction"), - "37": _("Costs"), - "35": _("Correction"), - "33": _("Value correction"), - "00": _("Undefined transaction") + "00": ["Undefined transactions", { + "89": "Cancellation of a transaction", + "87": "Costs refunded", + "85": "Correction", + "83": "Value correction", + "39": "Cancellation of a transaction", + "37": "Costs", + "35": "Correction", + "33": "Value correction", + "00": "Undefined transaction", }], - "01": [_("Domestic or local SEPA credit transfers"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "66": _("Financial centralization"), - "64": _("Transfer to your account"), - "62": _("Unpaid postal order"), - "60": _("Non-presented circular cheque"), - "54": _("Unexecutable transfer order"), - "52": _("Payment in your favour"), - "51": _("Transfer in your favour – initiated by the bank"), - "50": _("Transfer in your favour"), - "49": _("Cancellation or correction"), - "39": _("Your issue circular cheque"), - "37": _("Costs"), - "17": _("Financial centralisation"), - "15": _("Balance due insurance premium"), - "13": _("Transfer from your account"), - "11": _("Your semi-standing order – payment to employees"), - "09": _("Your semi-standing order"), - "07": _("Collective transfer"), - "05": _("Payment of wages etc."), - "03": _("Standing order"), - "02": _("Individual transfer order initiated by the bank"), - "01": _("Individual transfer order]"), + "01": ["Domestic or local SEPA credit transfers", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "66": "Financial centralization", + "64": "Transfer to your account", + "62": "Unpaid postal order", + "60": "Non-presented circular cheque", + "54": "Unexecutable transfer order", + "52": "Payment in your favour", + "51": "Transfer in your favour – initiated by the bank", + "50": "Transfer in your favour", + "49": "Cancellation or correction", + "39": "Your issue circular cheque", + "37": "Costs", + "17": "Financial centralisation", + "15": "Balance due insurance premium", + "13": "Transfer from your account", + "11": "Your semi-standing order – payment to employees", + "09": "Your semi-standing order", + "07": "Collective transfer", + "05": "Payment of wages etc.", + "03": "Standing order", + "02": "Individual transfer order initiated by the bank", + "01": "Individual transfer order", }], - "03": [_("Cheques"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of cheque-related costs"), - "68": _("Credit of a payment via electronic purse"), - "66": _("Remittance of cheque by your branch - credit under usual reserve"), - "64": _("Reversal of settlement of credit card"), - "63": _("Second credit of unpaid cheque"), - "62": _("Reversal of cheque"), - "60": _("Reversal of voucher"), - "58": _("Remittance of cheques, vouchers, etc. credit after collection"), - "56": _("Non-presented certified cheques"), - "52": _("First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve"), - "50": _("Credit of a payment via terminal"), - "49": _("Cancellation or correction"), - "39": _("Provisionally unpaid due to other reason than manual presentation"), - "38": _("Provisionally unpaid"), - "37": _("Cheque-related costs"), - "35": _("Cash advance"), - "19": _("Settlement of credit cards"), - "17": _("Your certified cheque"), - "15": _("Your purchase bank cheque"), - "13": _("Eurocheque written out abroad"), - "11": _("Department store cheque"), - "09": _("Unpaid voucher"), - "07": _("Definitely unpaid cheque"), - "05": _("Payment of voucher"), - "03": _("Your purchase by payment card"), - "01": _("Payment of your cheque"), + "03": ["Cheques", { + "99": "Cancellation or correction", + "87": "Reimbursement of cheque-related costs", + "68": "Credit of a payment via electronic purse", + "66": "Remittance of cheque by your branch - credit under usual reserve", + "64": "Reversal of settlement of credit card", + "63": "Second credit of unpaid cheque", + "62": "Reversal of cheque", + "60": "Reversal of voucher", + "58": "Remittance of cheques, vouchers, etc. credit after collection", + "56": "Non-presented certified cheques", + "52": "First credit of cheques, vouchers, luncheon vouchers, postal orders, credit under usual reserve", + "50": "Credit of a payment via terminal", + "49": "Cancellation or correction", + "39": "Provisionally unpaid due to other reason than manual presentation", + "38": "Provisionally unpaid", + "37": "Cheque-related costs", + "35": "Cash advance", + "19": "Settlement of credit cards", + "17": "Your certified cheque", + "15": "Your purchase bank cheque", + "13": "Eurocheque written out abroad", + "11": "Department store cheque", + "09": "Unpaid voucher", + "07": "Definitely unpaid cheque", + "05": "Payment of voucher", + "03": "Your purchase by payment card", + "01": "Payment of your cheque", }], - "04": [_("Cards"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "68": _("Credit after Proton payments"), - "55": _("Income from payments by GSM"), - "53": _("Cash deposit at an ATM"), - "52": _("Loading GSM cards"), - "51": _("Unloading Proton"), - "50": _("Credit after a payment at a terminal"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "08": _("Payment by means of a payment card outside the Eurozone"), - "07": _("Payment by GSM"), - "06": _("Payment with tank card"), - "05": _("Loading Proton"), - "04": _("Cash withdrawal from an ATM"), - "03": _("Settlement credit cards"), - "02": _("Payment by means of a payment card within the Eurozone"), - "01": _("Loading a GSM card"), + "04": ["Cards", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "68": "Credit after Proton payments", + "55": "Income from payments by GSM", + "53": "Cash deposit at an ATM", + "52": "Loading GSM cards", + "51": "Unloading Proton", + "50": "Credit after a payment at a terminal", + "49": "Cancellation or correction", + "37": "Costs", + "08": "Payment by means of a payment card outside the Eurozone", + "07": "Payment by GSM", + "06": "Payment with tank card", + "05": "Loading Proton", + "04": "Cash withdrawal from an ATM", + "03": "Settlement credit cards", + "02": "Payment by means of a payment card within the Eurozone", + "01": "Loading a GSM card", }], - "05": [_("Direct debit"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "58": _("Reversal"), - "56": _("Unexecutable reimbursement"), - "54": _("Reimbursement"), - "52": _("Credit under usual reserve"), - "50": _("Credit after collection"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "05": _("Reimbursement"), - "03": _("Unpaid debt"), - "01": _("Payment"), + "05": ["Direct debit", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "58": "Reversal", + "56": "Unexecutable reimbursement", + "54": "Reimbursement", + "52": "Credit under usual reserve", + "50": "Credit after collection", + "49": "Cancellation or correction", + "37": "Costs", + "05": "Reimbursement", + "03": "Unpaid debt", + "01": "Payment", }], - "07": [_("Domestic commercial paper"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "86": _("Payment after cession"), - "64": _("Warrant"), - "58": _("Remittance of supplier's bill without guarantee"), - "56": _("Remittance of supplier's bill with guarantee"), - "54": _("Remittance of commercial paper for discount"), - "52": _("Remittance of commercial paper - credit under usual reserve"), - "50": _("Remittance of commercial paper - credit after collection"), - "49": _("Cancellation or correction"), - "39": _("Return of an irregular bill of exchange"), - "37": _("Costs related to commercial paper"), - "14": _("Warrant fallen due"), - "12": _("Safe custody"), - "10": _("Renewal of agreed maturity date"), - "09": _("Agio on supplier's bill"), - "08": _("Payment in advance"), - "07": _("Unpaid commercial paper"), - "06": _("Extension of maturity date"), - "05": _("Commercial paper claimed back"), - "03": _("Payment receipt card"), - "01": _("Payment commercial paper"), + "07": ["Domestic commercial paper", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "86": "Payment after cession", + "64": "Warrant", + "58": "Remittance of supplier's bill without guarantee", + "56": "Remittance of supplier's bill with guarantee", + "54": "Remittance of commercial paper for discount", + "52": "Remittance of commercial paper - credit under usual reserve", + "50": "Remittance of commercial paper - credit after collection", + "49": "Cancellation or correction", + "39": "Return of an irregular bill of exchange", + "37": "Costs related to commercial paper", + "14": "Warrant fallen due", + "12": "Safe custody", + "10": "Renewal of agreed maturity date", + "09": "Agio on supplier's bill", + "08": "Payment in advance", + "07": "Unpaid commercial paper", + "06": "Extension of maturity date", + "05": "Commercial paper claimed back", + "03": "Payment receipt card", + "01": "Payment commercial paper", }], - "09": [_("Counter transactions"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Sale of traveller’s cheque"), - "68": _("Difference in payment"), - "66": _("Repurchase of petrol coupons"), - "64": _("Your winning lottery ticket"), - "62": _("Sale of gold/pieces under usual reserve"), - "60": _("Sale of foreign bank notes"), - "58": _("Payment by your branch/agents"), - "56": _("Reserve"), - "54": _("Your payment ATM"), - "52": _("Payment night safe"), - "50": _("Cash payment"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "25": _("Purchase of traveller’s cheque"), - "21": _("Cash withdrawal on card (PROTON)"), - "19": _("Difference in payment"), - "17": _("Purchase of fiscal stamps"), - "15": _("Your purchase of lottery tickets"), - "13": _("Cash withdrawal by your branch or agents"), - "11": _("Your purchase of luncheon vouchers"), - "09": _("Purchase of petrol coupons"), - "07": _("Purchase of gold/pieces"), - "05": _("Purchase of foreign bank notes"), - "03": _("Cash withdrawal by card (ATM)"), - "01": _("Cash withdrawal"), + "09": ["Counter transactions", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "70": "Sale of traveller’s cheque", + "68": "Difference in payment", + "66": "Repurchase of petrol coupons", + "64": "Your winning lottery ticket", + "62": "Sale of gold/pieces under usual reserve", + "60": "Sale of foreign bank notes", + "58": "Payment by your branch/agents", + "56": "Reserve", + "54": "Your payment ATM", + "52": "Payment night safe", + "50": "Cash payment", + "49": "Cancellation or correction", + "37": "Costs", + "25": "Purchase of traveller’s cheque", + "21": "Cash withdrawal on card (PROTON)", + "19": "Difference in payment", + "17": "Purchase of fiscal stamps", + "15": "Your purchase of lottery tickets", + "13": "Cash withdrawal by your branch or agents", + "11": "Your purchase of luncheon vouchers", + "09": "Purchase of petrol coupons", + "07": "Purchase of gold/pieces", + "05": "Purchase of foreign bank notes", + "03": "Cash withdrawal by card (ATM)", + "01": "Cash withdrawal", }], - "11": [_("Securities"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Settlement of securities"), - "68": _("Compensation for missing coupon"), - "66": _("Retrocession of issue commission"), - "64": _("Your issue"), - "62": _("Interim interest on subscription"), - "58": _("Repayable securities from a deposit or delivered at the counter - credit under usual reserve"), - "56": _("Reserve"), - "52": _("Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve"), - "51": _("Tender"), - "50": _("Sale of securities"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "19": _("Regularisation costs"), - "17": _("Management fee"), - "15": _("Interim interest on subscription"), - "13": _("Your repurchase of issue"), - "11": _("Payable coupons/repayable securities"), - "09": _("Settlement of securities"), - "06": _("Share option plan – exercising an option"), - "05": _("Partial payment subscription"), - "04": _("Issues"), - "03": _("Subscription to securities"), - "02": _("Tenders"), - "01": _("Purchase of securities"), + "11": ["Securities", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "70": "Settlement of securities", + "68": "Compensation for missing coupon", + "66": "Retrocession of issue commission", + "64": "Your issue", + "62": "Interim interest on subscription", + "58": "Repayable securities from a deposit or delivered at the counter - credit under usual reserve", + "56": "Reserve", + "52": "Payment of coupons from a deposit or settlement of coupons delivered over the counter - credit under usual reserve", + "51": "Tender", + "50": "Sale of securities", + "49": "Cancellation or correction", + "37": "Costs", + "19": "Regularisation costs", + "17": "Management fee", + "15": "Interim interest on subscription", + "13": "Your repurchase of issue", + "11": "Payable coupons/repayable securities", + "09": "Settlement of securities", + "06": "Share option plan – exercising an option", + "05": "Partial payment subscription", + "04": "Issues", + "03": "Subscription to securities", + "02": "Tenders", + "01": "Purchase of securities", }], - "13": [_("Credit"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Settlement of discount bank acceptance"), - "68": _("Documentary export credits"), - "62": _("Term loan"), - "60": _("Settlement of mortgage loan"), - "56": _("Subsidy"), - "55": _("Fixed advance – interest only"), - "54": _("Fixed advance – capital and interest"), - "50": _("Settlement of instalment credit"), - "49": _("Cancellation or correction"), - "37": _("Credit-related costs"), - "21": _("Other credit applications"), - "19": _("Documentary import credits"), - "15": _("Your repayment hire-purchase and similar claims"), - "13": _("Settlement of bank acceptances"), - "11": _("Your repayment mortgage loan"), - "07": _("Your repayment instalment credits"), - "05": _("Settlement of fixed advance"), - "02": _("Long-term loan"), - "01": _("Short-term loan"), + "13": ["Credit", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "70": "Settlement of discount bank acceptance", + "68": "Documentary export credits", + "62": "Term loan", + "60": "Settlement of mortgage loan", + "56": "Subsidy", + "55": "Fixed advance – interest only", + "54": "Fixed advance – capital and interest", + "50": "Settlement of instalment credit", + "49": "Cancellation or correction", + "37": "Credit-related costs", + "21": "Other credit applications", + "19": "Documentary import credits", + "15": "Your repayment hire-purchase and similar claims", + "13": "Settlement of bank acceptances", + "11": "Your repayment mortgage loan", + "07": "Your repayment instalment credits", + "05": "Settlement of fixed advance", + "02": "Long-term loan", + "01": "Short-term loan", }], - "30": [_("Various transactions"), { - "99": _("Cancellation or correction"), - "89": _("Undefined transaction"), - "87": _("Reimbursement of costs"), - "83": _("Value (date) correction"), - "55": _("Interest term investment"), - "54": _("Capital and/or interest term investment"), - "52": _("Forward sale of foreign exchange"), - "50": _("Spot sale of foreign exchange"), - "49": _("Cancellation or correction"), - "39": _("Undefined transaction"), - "37": _("Costs"), - "33": _("Value (date) correction"), - "05": _("Capital and/or interest term investment"), - "03": _("Forward purchase of foreign exchange"), - "01": _("Spot purchase of foreign exchange"), + "30": ["Various transactions", { + "99": "Cancellation or correction", + "89": "Undefined transaction", + "87": "Reimbursement of costs", + "83": "Value (date) correction", + "55": "Interest term investment", + "54": "Capital and/or interest term investment", + "52": "Forward sale of foreign exchange", + "50": "Spot sale of foreign exchange", + "49": "Cancellation or correction", + "39": "Undefined transaction", + "37": "Costs", + "33": "Value (date) correction", + "05": "Capital and/or interest term investment", + "03": "Forward purchase of foreign exchange", + "01": "Spot purchase of foreign exchange", }], - "35": [_("Closing (periodical settlements for interest, costs,…)"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "50": _("Closing"), - "49": _("Cancellation or correction"), - "37": _("Costs"), - "01": _("Closing"), + "35": ["Closing (periodical settlements for interest, costs,…)", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "50": "Closing", + "49": "Cancellation or correction", + "37": "Costs", + "01": "Closing", }], - "41": [_("International credit transfers - non-SEPA credit transfers"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "66": _("Financial centralisation (credit)"), - "64": _("Transfer to your account"), - "50": _("Transfer"), - "49": _("Cancellation or correction"), - "38": _("Costs relating to incoming foreign and non-SEPA transfers"), - "37": _("Costs relating to outgoing foreign transfers and non-SEPA transfers"), - "17": _("Financial centralisation (debit)"), - "13": _("Transfer from your account"), - "07": _("Collective transfers"), - "05": _("Collective payments of wages"), - "03": _("Standing order"), - "01": _("Transfer"), + "41": ["International credit transfers - non-SEPA credit transfers", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "66": "Financial centralisation (credit)", + "64": "Transfer to your account", + "50": "Transfer", + "49": "Cancellation or correction", + "38": "Costs relating to incoming foreign and non-SEPA transfers", + "37": "Costs relating to outgoing foreign transfers and non-SEPA transfers", + "17": "Financial centralisation (debit)", + "13": "Transfer from your account", + "07": "Collective transfers", + "05": "Collective payments of wages", + "03": "Standing order", + "01": "Transfer", }], - "43": [_("Foreign cheques"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "70": _("Purchase of traveller’s cheque"), - "62": _("Reversal of cheques"), - "58": _("Remittance of foreign cheque credit after collection"), - "52": _("Remittance of foreign cheque credit under usual reserve"), - "49": _("Cancellation or correction"), - "37": _("Costs relating to payment of foreign cheques"), - "15": _("Purchase of an international bank cheque"), - "07": _("Unpaid foreign cheque"), - "01": _("Payment of a foreign cheque"), + "43": ["Foreign cheques", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "70": "Purchase of traveller’s cheque", + "62": "Reversal of cheques", + "58": "Remittance of foreign cheque credit after collection", + "52": "Remittance of foreign cheque credit under usual reserve", + "49": "Cancellation or correction", + "37": "Costs relating to payment of foreign cheques", + "15": "Purchase of an international bank cheque", + "07": "Unpaid foreign cheque", + "01": "Payment of a foreign cheque", }], - "47": [_("Foreign commercial paper"), { - "99": _("Cancellation or correction"), - "87": _("Reimbursement of costs"), - "64": _("Warrant"), - "62": _("Remittance of documents abroad - credit after collection"), - "60": _("Remittance of documents abroad - credit under usual reserve"), - "58": _("Idem without guarantee"), - "56": _("Remittance of guaranteed foreign supplier's bill"), - "54": _("Discount abroad"), - "52": _("Remittance of foreign bill credit under usual reserve"), - "50": _("Remittance of foreign bill credit after collection"), - "49": _("Cancellation or correction"), - "37": _("Costs relating to the payment of a foreign bill"), - "14": _("Warrant fallen due"), - "13": _("Discount foreign supplier's bills"), - "11": _("Payment documents abroad"), - "07": _("Unpaid foreign bill"), - "06": _("Extension"), - "05": _("Bill claimed back"), - "01": _("Payment of foreign bill"), + "47": ["Foreign commercial paper", { + "99": "Cancellation or correction", + "87": "Reimbursement of costs", + "64": "Warrant", + "62": "Remittance of documents abroad - credit after collection", + "60": "Remittance of documents abroad - credit under usual reserve", + "58": "Idem without guarantee", + "56": "Remittance of guaranteed foreign supplier's bill", + "54": "Discount abroad", + "52": "Remittance of foreign bill credit under usual reserve", + "50": "Remittance of foreign bill credit after collection", + "49": "Cancellation or correction", + "37": "Costs relating to the payment of a foreign bill", + "14": "Warrant fallen due", + "13": "Discount foreign supplier's bills", + "11": "Payment documents abroad", + "07": "Unpaid foreign bill", + "06": "Extension", + "05": "Bill claimed back", + "01": "Payment of foreign bill", }], - "49": [_("Foreign counter transactions"), {"03": _("ATM withdrawal")}], - "80": [_("Separately charged costs and provisions"), { - "01": _("Guarantee card charges"), - "02": _("Costs relating to electronic output"), - "03": _("Payment card charges"), - "04": _("Costs for holding a documentary cash credit"), - "05": _("Card charges"), - "06": _("Damage relating to bills and cheques"), - "07": _("Insurance costs"), - "08": _("Registering compensation for savings accounts"), - "09": _("Postage"), - "10": _("Purchase of Smartcard"), - "11": _("Costs for the safe custody of correspondence"), - "12": _("Costs for opening a bank guarantee"), - "13": _("Renting of safes"), - "14": _("Handling costs instalment credit"), - "15": _("Night safe"), - "16": _("Bank confirmation to revisor or accountant"), - "17": _("Charge for safe custody"), - "18": _("Trade information"), - "19": _("Special charge for safe custody"), - "20": _("Drawing up a certificate"), - "21": _("Pay-packet charges"), - "22": _("Management/custody"), - "23": _("Research costs"), - "24": _("Participation in and management of interest refund system"), - "25": _("Renting of direct debit box"), - "26": _("Travel insurance premium"), - "27": _("Subscription fee"), - "29": _("Information charges"), - "31": _("Writ service fee"), - "33": _("Miscellaneous fees and commissions"), - "35": _("Costs"), - "37": _("Access right to database"), - "39": _("Surety fee"), - "41": _("Research costs"), - "43": _("Printing of forms"), - "45": _("Documentary credit charges"), - "47": _("Charging fees for transactions"), - "49": _("Cancellation or correction"), - "99": _("Cancellation or correction"), + "49": ["Foreign counter transactions", {"03": "ATM withdrawal"}], + "80": ["Separately charged costs and provisions", { + "01": "Guarantee card charges", + "02": "Costs relating to electronic output", + "03": "Payment card charges", + "04": "Costs for holding a documentary cash credit", + "05": "Card charges", + "06": "Damage relating to bills and cheques", + "07": "Insurance costs", + "08": "Registering compensation for savings accounts", + "09": "Postage", + "10": "Purchase of Smartcard", + "11": "Costs for the safe custody of correspondence", + "12": "Costs for opening a bank guarantee", + "13": "Renting of safes", + "14": "Handling costs instalment credit", + "15": "Night safe", + "16": "Bank confirmation to revisor or accountant", + "17": "Charge for safe custody", + "18": "Trade information", + "19": "Special charge for safe custody", + "20": "Drawing up a certificate", + "21": "Pay-packet charges", + "22": "Management/custody", + "23": "Research costs", + "24": "Participation in and management of interest refund system", + "25": "Renting of direct debit box", + "26": "Travel insurance premium", + "27": "Subscription fee", + "29": "Information charges", + "31": "Writ service fee", + "33": "Miscellaneous fees and commissions", + "35": "Costs", + "37": "Access right to database", + "39": "Surety fee", + "41": "Research costs", + "43": "Printing of forms", + "45": "Documentary credit charges", + "47": "Charging fees for transactions", + "49": "Cancellation or correction", + "99": "Cancellation or correction", }], } transaction_categories = { - "000": _("Net amount"), - "001": _("Interest received"), - "002": _("Interest paid"), - "003": _("Credit commission"), - "004": _("Postage"), - "005": _("Renting of letterbox"), - "006": _("Various fees/commissions"), - "007": _("Access right to database"), - "008": _("Information charges"), - "009": _("Travelling expenses"), - "010": _("Writ service fee"), - "011": _("VAT"), - "012": _("Exchange commission"), - "013": _("Payment commission"), - "014": _("Collection commission"), - "015": _("Correspondent charges"), - "016": _("BLIW/IBLC dues"), - "017": _("Research costs"), - "018": _("Tental guarantee charges"), - "019": _("Tax on physical delivery"), - "020": _("Costs of physical delivery"), - "021": _("Costs for drawing up a bank cheque"), - "022": _("Priority costs"), - "023": _("Exercising fee"), - "024": _("Growth premium"), - "025": _("Individual entry for exchange charges"), - "026": _("Handling commission"), - "027": _("Charges for unpaid bills"), - "028": _("Fidelity premium"), - "029": _("Protest charges"), - "030": _("Account insurance"), - "031": _("Charges foreign cheque"), - "032": _("Drawing up a circular cheque"), - "033": _("Charges for a foreign bill"), - "034": _("Reinvestment fee"), - "035": _("Charges foreign documentary bill"), - "036": _("Costs relating to a refused cheque"), - "037": _("Commission for handling charges"), - "039": _("Telecommunications"), - "041": _("Credit card costs"), - "042": _("Payment card costs"), - "043": _("Insurance costs"), - "045": _("Handling costs"), - "047": _("Charges extension bill"), - "049": _("Fiscal stamps/stamp duty"), - "050": _("Capital term investment"), - "051": _("Withholding tax"), - "052": _("Residence state tax"), - "053": _("Printing of forms"), - "055": _("Repayment loan or credit capital"), - "057": _("Interest subsidy"), - "058": _("Capital premium"), - "059": _("Default interest"), - "061": _("Charging fees for transactions"), - "063": _("Rounding differences"), - "065": _("Interest payment advice"), - "066": _("Fixed loan advance - reimbursement"), - "067": _("Fixed loan advance - extension"), - "068": _("Countervalue of an entry"), - "069": _("Forward arbitrage contracts : sum to be supplied by customer"), - "070": _("Forward arbitrage contracts : sum to be supplied by bank"), - "071": _("Fixed loan advance - availability"), - "072": _("Countervalue of commission to third party"), - "073": _("Costs of ATM abroad"), - "074": _("Mailing costs"), - "100": _("Gross amount"), - "200": _("Overall documentary credit charges"), - "201": _("Advice notice commission"), - "202": _("Advising commission | Additional advising commission"), - "203": _("Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission"), - "204": _("Amendment fee"), - "205": _("Documentary payment commission | Document commission | Drawdown fee | Negotiation fee"), - "206": _("Surety fee/payment under reserve"), - "207": _("Non-conformity fee"), - "208": _("Commitment fee deferred payment"), - "209": _("Transfer commission"), - "210": _("Commitment fee"), - "211": _("Credit arrangement fee | Additional credit arrangement fee"), - "212": _("Warehousing fee"), - "213": _("Financing fee"), - "214": _("Issue commission (delivery order)"), - "400": _("Acceptance fee"), - "401": _("Visa charges"), - "402": _("Certification costs"), - "403": _("Minimum discount rate"), - "404": _("Discount commission"), - "405": _("Bill guarantee commission"), - "406": _("Collection charges"), - "407": _("Costs Article 45"), - "408": _("Cover commission"), - "409": _("Safe deposit charges"), - "410": _("Reclamation charges"), - "411": _("Fixed collection charge"), - "412": _("Advice of expiry charges"), - "413": _("Acceptance charges"), - "414": _("Regularisation charges"), - "415": _("Surety fee"), - "416": _("Charges for the deposit of security"), - "418": _("Endorsement commission"), - "419": _("Bank service fee"), - "420": _("Retention charges"), - "425": _("Foreign broker's commission"), - "426": _("Belgian broker's commission"), - "427": _("Belgian Stock Exchange tax"), - "428": _("Interest accrued"), - "429": _("Foreign Stock Exchange tax"), - "430": _("Recovery of foreign tax"), - "431": _("Delivery of a copy"), + "000": "Net amount", + "001": "Interest received", + "002": "Interest paid", + "003": "Credit commission", + "004": "Postage", + "005": "Renting of letterbox", + "006": "Various fees/commissions", + "007": "Access right to database", + "008": "Information charges", + "009": "Travelling expenses", + "010": "Writ service fee", + "011": "VAT", + "012": "Exchange commission", + "013": "Payment commission", + "014": "Collection commission", + "015": "Correspondent charges", + "016": "BLIW/IBLC dues", + "017": "Research costs", + "018": "Tental guarantee charges", + "019": "Tax on physical delivery", + "020": "Costs of physical delivery", + "021": "Costs for drawing up a bank cheque", + "022": "Priority costs", + "023": "Exercising fee", + "024": "Growth premium", + "025": "Individual entry for exchange charges", + "026": "Handling commission", + "027": "Charges for unpaid bills", + "028": "Fidelity premium", + "029": "Protest charges", + "030": "Account insurance", + "031": "Charges foreign cheque", + "032": "Drawing up a circular cheque", + "033": "Charges for a foreign bill", + "034": "Reinvestment fee", + "035": "Charges foreign documentary bill", + "036": "Costs relating to a refused cheque", + "037": "Commission for handling charges", + "039": "Telecommunications", + "041": "Credit card costs", + "042": "Payment card costs", + "043": "Insurance costs", + "045": "Handling costs", + "047": "Charges extension bill", + "049": "Fiscal stamps/stamp duty", + "050": "Capital term investment", + "051": "Withholding tax", + "052": "Residence state tax", + "053": "Printing of forms", + "055": "Repayment loan or credit capital", + "057": "Interest subsidy", + "058": "Capital premium", + "059": "Default interest", + "061": "Charging fees for transactions", + "063": "Rounding differences", + "065": "Interest payment advice", + "066": "Fixed loan advance - reimbursement", + "067": "Fixed loan advance - extension", + "068": "Countervalue of an entry", + "069": "Forward arbitrage contracts : sum to be supplied by customer", + "070": "Forward arbitrage contracts : sum to be supplied by bank", + "071": "Fixed loan advance - availability", + "072": "Countervalue of commission to third party", + "073": "Costs of ATM abroad", + "074": "Mailing costs", + "100": "Gross amount", + "200": "Overall documentary credit charges", + "201": "Advice notice commission", + "202": "Advising commission | Additional advising commission", + "203": "Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | Confirmation reservation commission | Additional reservation commission", + "204": "Amendment fee", + "205": "Documentary payment commission | Document commission | Drawdown fee | Negotiation fee", + "206": "Surety fee/payment under reserve", + "207": "Non-conformity fee", + "208": "Commitment fee deferred payment", + "209": "Transfer commission", + "210": "Commitment fee", + "211": "Credit arrangement fee | Additional credit arrangement fee", + "212": "Warehousing fee", + "213": "Financing fee", + "214": "Issue commission (delivery order)", + "400": "Acceptance fee", + "401": "Visa charges", + "402": "Certification costs", + "403": "Minimum discount rate", + "404": "Discount commission", + "405": "Bill guarantee commission", + "406": "Collection charges", + "407": "Costs Article 45", + "408": "Cover commission", + "409": "Safe deposit charges", + "410": "Reclamation charges", + "411": "Fixed collection charge", + "412": "Advice of expiry charges", + "413": "Acceptance charges", + "414": "Regularisation charges", + "415": "Surety fee", + "416": "Charges for the deposit of security", + "418": "Endorsement commission", + "419": "Bank service fee", + "420": "Retention charges", + "425": "Foreign broker's commission", + "426": "Belgian broker's commission", + "427": "Belgian Stock Exchange tax", + "428": "Interest accrued", + "429": "Foreign Stock Exchange tax", + "430": "Recovery of foreign tax", + "431": "Delivery of a copy", } From 7232c1f986718bf9808af4d625dd163637cb3ac1 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 12:18:16 +0100 Subject: [PATCH 11/32] [DEL]Useless dependances + [ADD]Statement journal depending on bank account, statement line account depending on bank accont or partner if setted, statement line type bzr revid: dle@openerp.com-20121206111816-c0t7mfy1x6seezev --- addons/l10n_be_coda/__openerp__.py | 2 +- .../wizard/account_coda_import.py | 26 ++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/addons/l10n_be_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py index 14e1bf6e443..0cb29bcc002 100644 --- a/addons/l10n_be_coda/__openerp__.py +++ b/addons/l10n_be_coda/__openerp__.py @@ -90,7 +90,7 @@ V2.2 specifications. If required, you can manually adjust the descriptions via the CODA configuration menu. ''', 'images' : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'], - 'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], + 'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba',], 'demo': [], 'data': [ 'l10n_be_coda_wizard.xml', diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 2286caf8f68..eac8f83e6da 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -262,25 +262,39 @@ class account_coda_import(osv.osv_memory): line['counterpartyNumber'] = False except: pass + partner = None partner_id = None if 'counterpartyNumber' in line and line['counterpartyNumber']: ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) if ids and len(ids) > 0: - partner_id = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id.id + partner = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id + partner_id = partner.id + if partner: + if partner.customer: + line['type'] = 'customer' else: - partner_id = None + line['type'] = 'supplier' + if line['debit'] == '1': + line['account'] = partner.property_account_payable.id + else: + line['account'] = partner.property_account_receivable.id + else: + line['type'] = 'general' + if line['debit'] == '1': + line['account'] = statement['journal_id'].default_debit_account_id.id + else: + line['account'] = statement['journal_id'].default_credit_account_id.id + data = { 'name': line['communication'], 'note': "\n".join(note), 'date': line['entryDate'], 'amount': line['amount'], - # 'type': '', + 'type': line['type'], 'partner_id': partner_id, - 'account_id': 1, # TODO + 'account_id': line['account'], 'statement_id': statement['id'], - # 'analytic_account_id': '', - # 'move_ids': '', 'ref': line['ref'], 'sequence': line['sequence'], } From d8a949edffc9e3f973680b4bd95f49f7a1e114b1 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 12:27:02 +0100 Subject: [PATCH 12/32] [ADD]Structured communications bzr revid: dle@openerp.com-20121206112702-ii47dx25r7amegrq --- addons/l10n_be_coda/wizard/account_coda_import.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index eac8f83e6da..fdabf9e8615 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -126,7 +126,11 @@ class account_coda_import(osv.osv_memory): statementLine['transaction_family'] = rmspaces(line[54:56]) statementLine['transaction_code'] = rmspaces(line[56:58]) statementLine['transaction_category'] = rmspaces(line[58:61]) - statementLine['communication'] = rmspaces(line[62:115]) + if line[61] == '1': + #Structured communication + statementLine['communication'] = '+++' + line[65:68] + '/' + line[68:72] + '/' + line[72:77] + '+++' + else: + statementLine['communication'] = rmspaces(line[62:115]) statementLine['entryDate'] = rmspaces(line[115:121]) statementLine['type'] = 'normal' statementLine['globalisation'] = int(line[124]) From 0fc6e5480bef93c8729d39c04444c22fd1b6a3fa Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 16:12:07 +0100 Subject: [PATCH 13/32] [FIX]Name field displayed back in bank statement form (instead of displaying notes), handling structured communication types, defining account depending on partner found thanks to invoice or bank account bzr revid: dle@openerp.com-20121206151207-o8zxzfoybmlv3u6b --- addons/account/account_view.xml | 3 +- .../wizard/account_coda_import.py | 140 +++++++++++++----- 2 files changed, 106 insertions(+), 37 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 7d18961a5a3..6d3519cc461 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -574,9 +574,8 @@ - - + diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index fdabf9e8615..d0ecefa6a9b 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -128,8 +128,12 @@ class account_coda_import(osv.osv_memory): statementLine['transaction_category'] = rmspaces(line[58:61]) if line[61] == '1': #Structured communication + statementLine['communication_struct'] = True + statementLine['communication_type'] = line[62:65] statementLine['communication'] = '+++' + line[65:68] + '/' + line[68:72] + '/' + line[72:77] + '+++' else: + #Non-structured communication + statementLine['communication_struct'] = False statementLine['communication'] = rmspaces(line[62:115]) statementLine['entryDate'] = rmspaces(line[115:121]) statementLine['type'] = 'normal' @@ -156,7 +160,8 @@ class account_coda_import(osv.osv_memory): raise osv.except_osv(_('Error') + 'R2005', _('CODA parsing error on movement data record 2.3, seq nr %s! Please report this issue via your OpenERP support channel.') % line[2:10]) if statement['version'] == '1': statement['lines'][-1]['counterpartyNumber'] = rmspaces(line[10:22]) - statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:125]) + statement['lines'][-1]['counterpartyName'] = rmspaces(line[47:73]) + statement['lines'][-1]['counterpartyAddress'] = rmspaces(line[73:125]) statement['lines'][-1]['counterpartyCurrency'] = '' else: if line[22] == ' ': @@ -235,15 +240,76 @@ class account_coda_import(osv.osv_memory): statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) for line in statement['lines']: if line['type'] == 'normal': + note = [] counterparty = [] if 'counterpartyName' in line: counterparty.append(line['counterpartyName']) - if 'counterpartyNumber' in line: + try: + if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: + line['counterpartyNumber'] = False + except: + pass + if 'counterpartyNumber' in line and line['counterpartyNumber']: counterparty.append(line['counterpartyNumber']) if len(counterparty) > 0: counterparty = '[' + ' / '.join(counterparty) + ']' else: counterparty = '/' + note.append(_('Counter Party') + ': ' + counterparty) + + partner = None + partner_id = None + invoice = False + if line['communication_struct'] and 'communication_type' in line and line['communication_type'] == '101': + ids = self.pool.get('account.invoice').search(cr, uid, [('reference', '=', line['communication']), ('reference_type', '=', 'bba')]) + if ids: + invoice = self.pool.get('account.invoice').browse(cr, uid, ids[0]) + partner = invoice.partner_id + partner_id = partner.id + if invoice.type in ['in_invoice', 'in_refund']: + line['type'] = 'supplier' + else: + line['type'] = 'customer' + if 'counterpartyNumber' in line and line['counterpartyNumber']: + ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) + if ids and len(ids) > 0: + partner = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id + partner_id = partner.id + if not invoice: + if partner.customer and line['debit'] == '0': + line['type'] = 'customer' + elif partner.supplier and line['debit'] == '1': + line['type'] = 'supplier' + else: + line['type'] = 'general' + # if line['debit'] == '1': + # line['account'] = partner.property_account_payable.id + # else: + # line['account'] = partner.property_account_receivable.id + if partner: + if line['type'] == 'customer': + line['account'] = partner.property_account_receivable.id + elif line['type'] == 'supplier': + line['account'] = partner.property_account_payable.id + else: + if line['debit'] == '1': + line['account'] = partner.property_account_payable.id + else: + line['account'] = partner.property_account_receivable.id + note.append(_('Communication') + ': ' + line['communication']) + if not partner: + line['type'] = 'general' + if line['debit'] == '1': + line['account'] = statement['journal_id'].default_debit_account_id.id + else: + line['account'] = statement['journal_id'].default_credit_account_id.id + note.append(_('Communication') + ': ' + line['communication']) + if 'communication_type' in line: + if line['communication_type'] in communication_types: + line['communication_type'] = communication_types[line['communication_type']] + else: + line['communication_type'] = 'Unknown' + note.append(_('Communication Type') + ': ' + line['communication_type']) if line['transaction_type'] in transaction_types: line['transaction_type'] = transaction_types[line['transaction_type']][1] if line['transaction_category'] in transaction_categories: @@ -253,45 +319,13 @@ class account_coda_import(osv.osv_memory): line['transaction_family'] = transaction_family[0] if line['transaction_code'] in transaction_family[1]: line['transaction_code'] = transaction_family[1][line['transaction_code']] - note = [] - note.append(_('Counter Party') + ': ' + counterparty) - note.append(_('Communication') + ': ' + line['communication']) note.append(_('Transaction type') + ': ' + line['transaction_type']) note.append(_('Transaction family') + ': ' + line['transaction_family']) note.append(_('Transaction code') + ': ' + line['transaction_code']) note.append(_('Transaction category') + ': ' + line['transaction_category']) - try: - if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: - line['counterpartyNumber'] = False - except: - pass - partner = None - partner_id = None - if 'counterpartyNumber' in line and line['counterpartyNumber']: - ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) - if ids and len(ids) > 0: - partner = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id - partner_id = partner.id - if partner: - if partner.customer: - line['type'] = 'customer' - else: - line['type'] = 'supplier' - if line['debit'] == '1': - line['account'] = partner.property_account_payable.id - else: - line['account'] = partner.property_account_receivable.id - else: - line['type'] = 'general' - if line['debit'] == '1': - line['account'] = statement['journal_id'].default_debit_account_id.id - else: - line['account'] = statement['journal_id'].default_credit_account_id.id - - data = { - 'name': line['communication'], + 'name': counterparty + '\n' + line['communication'], 'note': "\n".join(note), 'date': line['entryDate'], 'amount': line['amount'], @@ -752,6 +786,42 @@ transaction_categories = { "431": "Delivery of a copy", } +communication_types = { + "001": "Data concerning the counterparty", + "002": "Communication of the bank", + "003": "RBP data", + "004": "Counterparty’s banker", + "005": "Data concerning the correspondent", + "006": "Information concerning the detail amount", + "007": "Information concerning the detail cash", + "008": "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)", + "009": "Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)", + "010": "Information pertaining to sale or purchase of securities", + "011": "Information pertaining to coupons", + "100": "(SEPA) payment with a structured format communication applying the ISO standard 11649: Structured creditor reference to remittan", + "101": "Credit transfer or cash payment with structured format communication", + "102": "Credit transfer or cash payment with reconstituted structured format communication", + "103": "number (e.g. of the cheque, of the card, etc.)", + "104": "Equivalent in EUR", + "105": "original amount of the transaction", + "106": "Method of calculation (VAT, withholding tax on income, commission, etc.)", + "107": "Direct debit – DOM’80", + "108": "Closing", + "111": "POS credit – Globalisation", + "112": "ATM payment (usually Eurocheque card)", + "113": "ATM/POS debit", + "114": "POS credit - individual transaction", + "115": "Terminal cash deposit", + "120": "Correction of a transaction", + "121": "Commercial bills", + "122": "Bills - calculation of interest", + "123": "Fees and commissions", + "124": "Number of the credit card", + "125": "Credit", + "126": "Term investments", + "127": "European direct debit (SEPA)", +} + def rmspaces(s): return " ".join(s.split()) From 512a5c5ed6eb135b6005b549e1c93500bb6c1b1d Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 16:12:54 +0100 Subject: [PATCH 14/32] [DEL]Useless comment bzr revid: dle@openerp.com-20121206151254-qtedm28bxagp4shy --- addons/l10n_be_coda/wizard/account_coda_import.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index d0ecefa6a9b..5e6df14ffb4 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -282,10 +282,6 @@ class account_coda_import(osv.osv_memory): line['type'] = 'supplier' else: line['type'] = 'general' - # if line['debit'] == '1': - # line['account'] = partner.property_account_payable.id - # else: - # line['account'] = partner.property_account_receivable.id if partner: if line['type'] == 'customer': line['account'] = partner.property_account_receivable.id From 15b03bb0b684c4118adca60844ddcaaad3244e3b Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 16:55:24 +0100 Subject: [PATCH 15/32] [FIX]Name and note field not well structured bzr revid: dle@openerp.com-20121206155524-hha9r6ab931b3cj9 --- .../wizard/account_coda_import.py | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 5e6df14ffb4..aab468adcc9 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -241,21 +241,23 @@ class account_coda_import(osv.osv_memory): for line in statement['lines']: if line['type'] == 'normal': note = [] - counterparty = [] - if 'counterpartyName' in line: - counterparty.append(line['counterpartyName']) - try: - if 'counterpartyNumber' in line and int(line['counterpartyNumber']) == 0: - line['counterpartyNumber'] = False - except: - pass - if 'counterpartyNumber' in line and line['counterpartyNumber']: - counterparty.append(line['counterpartyNumber']) - if len(counterparty) > 0: - counterparty = '[' + ' / '.join(counterparty) + ']' + if 'counterpartyName' in line and line['counterpartyName'] != '': + note.append(_('Counter Party') + ': ' + line['counterpartyName']) else: - counterparty = '/' - note.append(_('Counter Party') + ': ' + counterparty) + line['counterpartyName'] = False + if 'counterpartyNumber' in line and line['counterpartyNumber'] != '': + try: + if int(line['counterpartyNumber']) == 0: + line['counterpartyNumber'] = False + except: + pass + if line['counterpartyNumber']: + note.append(_('Counter Party Account') + ': ' + line['counterpartyNumber']) + else: + line['counterpartyNumber'] = False + + if 'counterpartyAddress' in line and line['counterpartyAddress'] != '': + note.append(_('Counter Party Address') + ': ' + line['counterpartyAddress']) partner = None partner_id = None @@ -292,7 +294,6 @@ class account_coda_import(osv.osv_memory): line['account'] = partner.property_account_payable.id else: line['account'] = partner.property_account_receivable.id - note.append(_('Communication') + ': ' + line['communication']) if not partner: line['type'] = 'general' if line['debit'] == '1': @@ -321,7 +322,7 @@ class account_coda_import(osv.osv_memory): note.append(_('Transaction category') + ': ' + line['transaction_category']) data = { - 'name': counterparty + '\n' + line['communication'], + 'name': "\n".join(filter(None, [line['counterpartyName'], line['communication']])), 'note': "\n".join(note), 'date': line['entryDate'], 'amount': line['amount'], From 8f9ff4d19acd91ec63cd6a478ebaa1b2f677d6c4 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 16:59:37 +0100 Subject: [PATCH 16/32] [FIX]Entry date not parsed by strftime :( bzr revid: dle@openerp.com-20121206155937-8ngexk7iulkt04va --- addons/l10n_be_coda/wizard/account_coda_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index aab468adcc9..81bd2458496 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -135,7 +135,7 @@ class account_coda_import(osv.osv_memory): #Non-structured communication statementLine['communication_struct'] = False statementLine['communication'] = rmspaces(line[62:115]) - statementLine['entryDate'] = rmspaces(line[115:121]) + statementLine['entryDate'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[115:121]), '%d%m%y')) statementLine['type'] = 'normal' statementLine['globalisation'] = int(line[124]) if len(statement['globalisation_stack']) > 0 and statementLine['communication'] != '': From f876c1993068b4087e5d49a536da118db40f7e50 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 17:49:28 +0100 Subject: [PATCH 17/32] [ADD]Create voucher bzr revid: dle@openerp.com-20121206164928-axdnk309y2o3zwrr --- .../wizard/account_coda_import.py | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 81bd2458496..f1fcc8fd760 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -258,6 +258,7 @@ class account_coda_import(osv.osv_memory): if 'counterpartyAddress' in line and line['counterpartyAddress'] != '': note.append(_('Counter Party Address') + ': ' + line['counterpartyAddress']) + line['name'] = "\n".join(filter(None, [line['counterpartyName'], line['communication']])) partner = None partner_id = None @@ -268,10 +269,29 @@ class account_coda_import(osv.osv_memory): invoice = self.pool.get('account.invoice').browse(cr, uid, ids[0]) partner = invoice.partner_id partner_id = partner.id - if invoice.type in ['in_invoice', 'in_refund']: + # voucher_vals = { + # 'type': line['type'] == 'supplier' and 'payment' or 'receipt', + # 'name': line_name, + # 'partner_id': line['partner_id'], + # 'journal_id': statement['journal_id'], + # 'account_id': journal.default_credit_account_id.id, + # 'company_id': journal.company_id.id, + # 'currency_id': journal.company_id.currency_id.id, + # 'date': line['entry_date'], + # 'amount': abs(line['amount']), + # 'period_id': statement['period_id'], + # } + context = {'line_type': line['type'], 'default_type': line['amount'] < 0 and 'payment' or 'receipt', 'type': line['amount'] < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': statement['journal_id'].id, 'default_amount': abs(line['amount']), 'default_reference': line['ref'], 'default_date': line['entryDate'], 'default_name': line['name'], 'default_active': False} + if invoice.type in ['in_invoice', 'in_refund'] and line['debit'] == '1': line['type'] = 'supplier' - else: + print 'Supplier' + print self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_payable.id}, context=context) + elif invoice.type in ['out_invoice'] and line['debit'] == '0': line['type'] = 'customer' + print 'Customer' + print self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_receivable.id}, context=context) + else: + line['type'] = 'general' if 'counterpartyNumber' in line and line['counterpartyNumber']: ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) if ids and len(ids) > 0: @@ -322,7 +342,7 @@ class account_coda_import(osv.osv_memory): note.append(_('Transaction category') + ': ' + line['transaction_category']) data = { - 'name': "\n".join(filter(None, [line['counterpartyName'], line['communication']])), + 'name': line['name'], 'note': "\n".join(note), 'date': line['entryDate'], 'amount': line['amount'], From 6cb854df33e7ec5f543c9c13a68065b4a9b288b5 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 6 Dec 2012 18:35:30 +0100 Subject: [PATCH 18/32] [ADD]Voucher creation bzr revid: dle@openerp.com-20121206173530-s46asy6pomk6if4t --- .../wizard/account_coda_import.py | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index f1fcc8fd760..6de8bdc8104 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -269,27 +269,22 @@ class account_coda_import(osv.osv_memory): invoice = self.pool.get('account.invoice').browse(cr, uid, ids[0]) partner = invoice.partner_id partner_id = partner.id - # voucher_vals = { - # 'type': line['type'] == 'supplier' and 'payment' or 'receipt', - # 'name': line_name, - # 'partner_id': line['partner_id'], - # 'journal_id': statement['journal_id'], - # 'account_id': journal.default_credit_account_id.id, - # 'company_id': journal.company_id.id, - # 'currency_id': journal.company_id.currency_id.id, - # 'date': line['entry_date'], - # 'amount': abs(line['amount']), - # 'period_id': statement['period_id'], - # } - context = {'line_type': line['type'], 'default_type': line['amount'] < 0 and 'payment' or 'receipt', 'type': line['amount'] < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': statement['journal_id'].id, 'default_amount': abs(line['amount']), 'default_reference': line['ref'], 'default_date': line['entryDate'], 'default_name': line['name'], 'default_active': False} + context = { + 'default_partner_id': partner_id, + 'default_amount': abs(line['amount']), + 'default_number': invoice.name, + 'close_after_process': True, + 'invoice_type': invoice.type, + 'invoice_id': invoice.id, + 'default_type': invoice.type in ['out_invoice', 'out_refund'] and 'receipt' or 'payment', + 'type': invoice.type in ['out_invoice', 'out_refund'] and 'receipt' or 'payment' + } if invoice.type in ['in_invoice', 'in_refund'] and line['debit'] == '1': line['type'] = 'supplier' - print 'Supplier' - print self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_payable.id}, context=context) + line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_payable.id, 'journal_id': statement['journal_id'].id}, context=context) elif invoice.type in ['out_invoice'] and line['debit'] == '0': line['type'] = 'customer' - print 'Customer' - print self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_receivable.id}, context=context) + line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_receivable.id, 'journal_id': statement['journal_id'].id}, context=context) else: line['type'] = 'general' if 'counterpartyNumber' in line and line['counterpartyNumber']: @@ -340,7 +335,8 @@ class account_coda_import(osv.osv_memory): note.append(_('Transaction family') + ': ' + line['transaction_family']) note.append(_('Transaction code') + ': ' + line['transaction_code']) note.append(_('Transaction category') + ': ' + line['transaction_category']) - + if 'voucher_id' not in line: + line['voucher_id'] = None data = { 'name': line['name'], 'note': "\n".join(note), @@ -352,6 +348,7 @@ class account_coda_import(osv.osv_memory): 'statement_id': statement['id'], 'ref': line['ref'], 'sequence': line['sequence'], + 'voucher_id': line['voucher_id'], } self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) From bee5426c7093e3292441a214882e0207b7f9d8b0 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 7 Dec 2012 13:58:38 +0100 Subject: [PATCH 19/32] [FIX]Voucher and voucher line bzr revid: dle@openerp.com-20121207125838-n36yyge5d1vm65ir --- .../wizard/account_coda_import.py | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 6de8bdc8104..97d99b89e83 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -269,24 +269,47 @@ class account_coda_import(osv.osv_memory): invoice = self.pool.get('account.invoice').browse(cr, uid, ids[0]) partner = invoice.partner_id partner_id = partner.id - context = { - 'default_partner_id': partner_id, - 'default_amount': abs(line['amount']), - 'default_number': invoice.name, - 'close_after_process': True, - 'invoice_type': invoice.type, - 'invoice_id': invoice.id, - 'default_type': invoice.type in ['out_invoice', 'out_refund'] and 'receipt' or 'payment', - 'type': invoice.type in ['out_invoice', 'out_refund'] and 'receipt' or 'payment' - } + if invoice.type in ['in_invoice', 'in_refund'] and line['debit'] == '1': line['type'] = 'supplier' - line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_payable.id, 'journal_id': statement['journal_id'].id}, context=context) - elif invoice.type in ['out_invoice'] and line['debit'] == '0': + elif invoice.type in ['out_invoice', 'out_refund'] and line['debit'] == '0': line['type'] = 'customer' - line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, {'account_id': partner.property_account_receivable.id, 'journal_id': statement['journal_id'].id}, context=context) else: line['type'] = 'general' + line['reconcile'] = False + if invoice.type in ['in_invoice', 'out_invoice']: + iml_ids = self.pool.get('account.move.line').search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)]) + if iml_ids: + line['reconcile'] = iml_ids[0] + if line['reconcile']: + voucher_vals = { + 'type': line['type'] == 'supplier' and 'payment' or 'receipt', + 'name': line['name'], + 'partner_id': partner_id, + 'journal_id': statement['journal_id'].id, + 'account_id': statement['journal_id'].default_credit_account_id.id, + 'company_id': statement['journal_id'].company_id.id, + 'currency_id': statement['journal_id'].company_id.currency_id.id, + 'date': line['entryDate'], + 'amount': abs(line['amount']), + 'period_id': statement['period_id'], + 'invoice_id': invoice.id, + } + context['invoice_id'] = invoice.id + voucher_vals.update(self.pool.get('account.voucher').onchange_partner_id(cr, uid, [], + partner_id=partner_id, + journal_id=statement['journal_id'].id, + amount=abs(line['amount']), + currency_id=statement['journal_id'].company_id.currency_id.id, + ttype=line['type'] == 'supplier' and 'payment' or 'receipt', + date=line['transactionDate'], + context=context + )['value']) + line_drs = [] + for line_dr in voucher_vals['line_dr_ids']: + line_drs.append((0, 0, line_dr)) + voucher_vals['line_dr_ids'] = line_drs + line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, voucher_vals, context=context) if 'counterpartyNumber' in line and line['counterpartyNumber']: ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) if ids and len(ids) > 0: From a0a3f862cca0c64dfd19053fb51c68b78ab17ede Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 7 Dec 2012 15:14:50 +0100 Subject: [PATCH 20/32] [ADD]CODA Notes and statement lines views bzr revid: dle@openerp.com-20121207141450-i5kzwm1ojvkw42hy --- addons/l10n_be_coda/__init__.py | 1 + addons/l10n_be_coda/l10n_be_coda_view.xml | 93 ++++++++++++++++++- .../wizard/account_coda_import.py | 26 ++++-- 3 files changed, 110 insertions(+), 10 deletions(-) diff --git a/addons/l10n_be_coda/__init__.py b/addons/l10n_be_coda/__init__.py index c737eb79536..4a58b8ad059 100644 --- a/addons/l10n_be_coda/__init__.py +++ b/addons/l10n_be_coda/__init__.py @@ -20,6 +20,7 @@ # ############################################################################## +import l10n_be_coda import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 9a362cd6fc4..d4c896064a6 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -1,6 +1,97 @@ - + + account.bank.statement.form + account.bank.statement + + + + + + + + + + + bank.statement.line.coda.form + account.bank.statement.line + 10 + +
+ + + + + + + + + + + + + + + +
+ + account.bank.statement.line.coda.tree + account.bank.statement.line + 10 + + + + + + + + + + + + + + + + + + bank.statement.line.coda.filter + account.bank.statement.line + + + + + + + + + + + + + + + + + + + + + + + + + Bank Statement Lines + account.bank.statement.line + form + tree,form + {'block_statement_line_delete' : 1} + + + + + + \ No newline at end of file diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 97d99b89e83..9513d7accc2 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -188,8 +188,6 @@ class account_coda_import(osv.osv_memory): infoLine['transaction_code'] = rmspaces(line[34:36]) infoLine['transaction_category'] = rmspaces(line[36:39]) infoLine['communication'] = rmspaces(line[40:113]) - infoLine['amount'] = 0.0 - infoLine['type'] = 'information' statement['lines'].append(infoLine) elif line[1] == '2': if infoLine['ref'] != rmspaces(line[2:10]): @@ -205,8 +203,6 @@ class account_coda_import(osv.osv_memory): comm_line['sequence'] = len(statement['lines']) + 1 comm_line['ref'] = rmspaces(line[2:10]) comm_line['communication'] = rmspaces(line[32:112]) - comm_line['amount'] = 0.0 - comm_line['type'] = 'communication' statement['lines'].append(comm_line) elif line[0] == '8': # new balance record @@ -229,6 +225,7 @@ class account_coda_import(osv.osv_memory): if not statement['balance_end_real']: statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): + statement['coda_note'] = '' data = { 'name': '[' + statement['date'] + ']' + statement['description'], 'date': statement['date'], @@ -239,7 +236,20 @@ class account_coda_import(osv.osv_memory): } statement['id'] = self.pool.get('account.bank.statement').create(cr, uid, data, context=context) for line in statement['lines']: - if line['type'] == 'normal': + if line['type'] == 'information': + if line['transaction_type'] in transaction_types: + line['transaction_type'] = transaction_types[line['transaction_type']][1] + if line['transaction_category'] in transaction_categories: + line['transaction_category'] = transaction_categories[line['transaction_category']] + if line['transaction_family'] in transaction_codes: + transaction_family = transaction_codes[line['transaction_family']] + line['transaction_family'] = transaction_family[0] + if line['transaction_code'] in transaction_family[1]: + line['transaction_code'] = transaction_family[1][line['transaction_code']] + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Date: ' + str(line['entryDate']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'],'\n']) + elif line['type'] == 'communication': + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'],'\n']) + elif line['type'] == 'normal': note = [] if 'counterpartyName' in line and line['counterpartyName'] != '': note.append(_('Counter Party') + ': ' + line['counterpartyName']) @@ -259,7 +269,6 @@ class account_coda_import(osv.osv_memory): if 'counterpartyAddress' in line and line['counterpartyAddress'] != '': note.append(_('Counter Party Address') + ': ' + line['counterpartyAddress']) line['name'] = "\n".join(filter(None, [line['counterpartyName'], line['communication']])) - partner = None partner_id = None invoice = False @@ -342,8 +351,6 @@ class account_coda_import(osv.osv_memory): if 'communication_type' in line: if line['communication_type'] in communication_types: line['communication_type'] = communication_types[line['communication_type']] - else: - line['communication_type'] = 'Unknown' note.append(_('Communication Type') + ': ' + line['communication_type']) if line['transaction_type'] in transaction_types: line['transaction_type'] = transaction_types[line['transaction_type']][1] @@ -374,7 +381,8 @@ class account_coda_import(osv.osv_memory): 'voucher_id': line['voucher_id'], } self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) - + if statement['coda_note'] != '': + self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context) account_coda_import() transaction_types = { From 16bfe104aa6d1b49e685930b645b1017704d993e Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 7 Dec 2012 15:15:09 +0100 Subject: [PATCH 21/32] [ADD]coda py file bzr revid: dle@openerp.com-20121207141509-7i8evz7i5dn00b11 --- addons/l10n_be_coda/l10n_be_coda.py | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 addons/l10n_be_coda/l10n_be_coda.py diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py new file mode 100644 index 00000000000..e22bec27aab --- /dev/null +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -0,0 +1,34 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import osv, fields + + +class account_bank_statement(osv.osv): + _inherit = 'account.bank.statement' + _columns = { + 'coda_note': fields.text('CODA Notes'), + } + +account_bank_statement() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 8825ea3ae64180c89c15651ad19e2c28af55c32c Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 7 Dec 2012 15:31:44 +0100 Subject: [PATCH 22/32] [FIX]coda note with int not str, import wizard returns to banks statement tree bzr revid: dle@openerp.com-20121207143144-13vfmr4o37e1rntb --- addons/l10n_be_coda/l10n_be_coda_wizard.xml | 19 ------------------- .../wizard/account_coda_import.py | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml index 427e0c1991e..92b16db0e88 100644 --- a/addons/l10n_be_coda/l10n_be_coda_wizard.xml +++ b/addons/l10n_be_coda/l10n_be_coda_wizard.xml @@ -21,25 +21,6 @@ - - Import CODA File - account.coda.import - 2 - -
-
-
- - - -
- - - Import CODA File ir.actions.act_window diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 9513d7accc2..1118f5a4ae6 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -89,10 +89,10 @@ class account_coda_import(osv.osv_memory): raise osv.except_osv(_('Error') + 'R1002', _('Foreign bank accounts with IBAN structure are not supported ')) else: # Something else, not supported raise osv.except_osv(_('Error') + 'R1003', _('Unsupported bank account structure ')) - ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', statement['acc_number'])]) + bank_ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', statement['acc_number'])]) not_found_except = osv.except_osv(_('Error') + 'R1004', _("No matching CODA Bank Account Configuration record found. Please check if the 'Bank Account Number' and 'Currency' fields of your configuration record match with '%s' and '%s'.") % (statement['acc_number'], statement['currency'])) - if ids and len(ids) > 0: - bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, ids) + if bank_ids and len(bank_ids) > 0: + bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, bank_ids) for bank_acc in bank_accs: statement['journal_id'] = bank_acc.journal_id if (statement['journal_id'].currency and statement['journal_id'].currency.name != statement['currency']) and (not statement['journal_id'].currency and statement['journal_id'].company_id.currency_id.name != statement['currency']): @@ -246,9 +246,9 @@ class account_coda_import(osv.osv_memory): line['transaction_family'] = transaction_family[0] if line['transaction_code'] in transaction_family[1]: line['transaction_code'] = transaction_family[1][line['transaction_code']] - statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Date: ' + str(line['entryDate']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'],'\n']) + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Date: ' + str(line['entryDate']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'], '\n']) elif line['type'] == 'communication': - statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'],'\n']) + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'], '\n']) elif line['type'] == 'normal': note = [] if 'counterpartyName' in line and line['counterpartyName'] != '': @@ -383,6 +383,14 @@ class account_coda_import(osv.osv_memory): self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) if statement['coda_note'] != '': self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context) + return { + 'view_type': 'form', + 'view_mode': 'tree', + 'res_model': 'account.bank.statement', + 'view_id': False, + 'context': context, + 'type': 'ir.actions.act_window', + } account_coda_import() transaction_types = { From fbcdfed860176b6c5af35c9a8d6843d8c938e633 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Fri, 7 Dec 2012 15:55:19 +0100 Subject: [PATCH 23/32] [FIX]Groups technical for CODA Notes and bank statement lines, form added to view mode for views after import, coda note information reference bzr revid: dle@openerp.com-20121207145519-4vbb1otng09wj3kg --- addons/l10n_be_coda/l10n_be_coda_view.xml | 4 ++-- addons/l10n_be_coda/l10n_be_coda_wizard.xml | 10 +++++----- addons/l10n_be_coda/wizard/account_coda_import.py | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index d4c896064a6..538332b37d2 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -7,7 +7,7 @@ - + @@ -91,7 +91,7 @@ - + \ No newline at end of file diff --git a/addons/l10n_be_coda/l10n_be_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml index 92b16db0e88..dddc18bb30a 100644 --- a/addons/l10n_be_coda/l10n_be_coda_wizard.xml +++ b/addons/l10n_be_coda/l10n_be_coda_wizard.xml @@ -8,15 +8,15 @@ 1
-
-
+
+
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 1118f5a4ae6..7d50e4ba0d3 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -246,9 +246,9 @@ class account_coda_import(osv.osv_memory): line['transaction_family'] = transaction_family[0] if line['transaction_code'] in transaction_family[1]: line['transaction_code'] = transaction_family[1][line['transaction_code']] - statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Date: ' + str(line['entryDate']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'], '\n']) + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' with Ref. ' + str(line['ref']), 'Date: ' + str(line['entryDate']), 'Communication: ' + line['communication'], '']) elif line['type'] == 'communication': - statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' #' + str(line['sequence']), 'Ref: ' + str(line['ref']), 'Communication: ' + line['communication'], '\n']) + statement['coda_note'] = "\n".join([statement['coda_note'], line['type'].title() + ' with Ref. ' + str(line['ref']), 'Ref: ', 'Communication: ' + line['communication'], '']) elif line['type'] == 'normal': note = [] if 'counterpartyName' in line and line['counterpartyName'] != '': @@ -385,7 +385,7 @@ class account_coda_import(osv.osv_memory): self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context) return { 'view_type': 'form', - 'view_mode': 'tree', + 'view_mode': 'tree,form', 'res_model': 'account.bank.statement', 'view_id': False, 'context': context, From 62bb893da70b757813fc20a49a64ed527394cddf Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Sat, 8 Dec 2012 12:08:02 +0100 Subject: [PATCH 24/32] [FIX]Mmissing adding magic number for credit lines in voucher bzr revid: dle@openerp.com-20121208110802-226tomv7ni26r0nh --- addons/l10n_be_coda/wizard/account_coda_import.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 7d50e4ba0d3..d27b28c315c 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -318,6 +318,10 @@ class account_coda_import(osv.osv_memory): for line_dr in voucher_vals['line_dr_ids']: line_drs.append((0, 0, line_dr)) voucher_vals['line_dr_ids'] = line_drs + line_crs = [] + for line_cr in voucher_vals['line_cr_ids']: + line_crs.append((0, 0, line_cr)) + voucher_vals['line_cr_ids'] = line_crs line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, voucher_vals, context=context) if 'counterpartyNumber' in line and line['counterpartyNumber']: ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))]) From 07527e1503b93926ab2cecc15d78d4705ac897a3 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 10 Dec 2012 13:22:47 +0100 Subject: [PATCH 25/32] [ADD]Check start balance option bzr revid: dle@openerp.com-20121210122247-qb2sa1k183wrxh3d --- addons/l10n_be_coda/l10n_be_coda_view.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 538332b37d2..4cb863d234a 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -2,7 +2,7 @@ - account.bank.statement.form + account.bank.statement.coda.form account.bank.statement @@ -13,6 +13,18 @@ + + res.partner.bank.coda.form + res.partner.bank + + + + + + + + + bank.statement.line.coda.form account.bank.statement.line From 54a39ac1b1ef5ebe7071afccdf3a25e097f70833 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 10 Dec 2012 13:55:17 +0100 Subject: [PATCH 26/32] [ADD]Missing py bzr revid: dle@openerp.com-20121210125517-z4ehmco5dkmdxhmf --- addons/l10n_be_coda/l10n_be_coda.py | 42 +++++++++++++++++++ .../wizard/account_coda_import.py | 16 ++++++- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 addons/l10n_be_coda/l10n_be_coda.py diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py new file mode 100644 index 00000000000..13b67e76bfd --- /dev/null +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import osv, fields + + +class account_bank_statement(osv.osv): + _inherit = 'account.bank.statement' + _columns = { + 'coda_note': fields.text('CODA Notes'), + } + + +class res_bank(osv.osv): + _inherit = 'res.partner.bank' + _columns = { + 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', + help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), + } + +account_bank_statement() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index d27b28c315c..671a0a93335 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -94,9 +94,12 @@ class account_coda_import(osv.osv_memory): if bank_ids and len(bank_ids) > 0: bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, bank_ids) for bank_acc in bank_accs: - statement['journal_id'] = bank_acc.journal_id - if (statement['journal_id'].currency and statement['journal_id'].currency.name != statement['currency']) and (not statement['journal_id'].currency and statement['journal_id'].company_id.currency_id.name != statement['currency']): + if (bank_acc.journal_id.currency and bank_acc.journal_id.currency.name != statement['currency']) and (not bank_acc.journal_id.currency and bank_acc.journal_id.company_id.currency_id.name != statement['currency']): raise not_found_except + else: + statement['journal_id'] = bank_acc.journal_id + statement['bank_account'] = bank_acc + break else: raise not_found_except statement['description'] = rmspaces(line[90:125]) @@ -225,6 +228,15 @@ class account_coda_import(osv.osv_memory): if not statement['balance_end_real']: statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): + balance_start_check_date = (len(statement['lines']) > 0 and statement['lines'][0]['entryDate']) or statement['date'] + cr.execute('SELECT balance_end_real \ + FROM account_bank_statement \ + WHERE journal_id = %s and date <= %s \ + ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'].id, balance_start_check_date)) + print statement['bank_account'].balance_start_enforce + res = cr.fetchone() + balance_start_check = res and res[0] + print balance_start_check statement['coda_note'] = '' data = { 'name': '[' + statement['date'] + ']' + statement['description'], From 257db6feffb77844274828246af7eb1fee415a0b Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 10 Dec 2012 14:33:34 +0100 Subject: [PATCH 27/32] [ADD]Balance check bzr revid: dle@openerp.com-20121210133334-jxepuwxf9safyeur --- addons/l10n_be_coda/l10n_be_coda.py | 6 +++--- addons/l10n_be_coda/wizard/account_coda_import.py | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index 13b67e76bfd..0b8bbf1bc24 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -27,14 +27,14 @@ class account_bank_statement(osv.osv): _inherit = 'account.bank.statement' _columns = { 'coda_note': fields.text('CODA Notes'), - } + } class res_bank(osv.osv): _inherit = 'res.partner.bank' _columns = { - 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', - help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), + 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', + help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), } account_bank_statement() diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 671a0a93335..45b09e1a42f 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -228,16 +228,25 @@ class account_coda_import(osv.osv_memory): if not statement['balance_end_real']: statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): + statement['coda_note'] = '' balance_start_check_date = (len(statement['lines']) > 0 and statement['lines'][0]['entryDate']) or statement['date'] cr.execute('SELECT balance_end_real \ FROM account_bank_statement \ WHERE journal_id = %s and date <= %s \ ORDER BY date DESC,id DESC LIMIT 1', (statement['journal_id'].id, balance_start_check_date)) - print statement['bank_account'].balance_start_enforce res = cr.fetchone() balance_start_check = res and res[0] - print balance_start_check - statement['coda_note'] = '' + if balance_start_check == None: + if statement['journal_id'].default_debit_account_id and (statement['journal_id'].default_credit_account_id == statement['journal_id'].default_debit_account_id): + balance_start_check = statement['journal_id'].default_debit_account_id.balance + else: + raise osv.except_osv(_('Error'), _("Configuration Error in journal %s!\nPlease verify the Default Debit and Credit Account settings.") % statement['journal_id'].name) + if balance_start_check != statement['balance_start']: + balance_start_enforce_err = _("The CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!") % (statement['description'] + ' #' + statement['paperSeqNumber'], statement['balance_start'], balance_start_check, statement['journal_id'].name) + if statement['bank_account'].balance_start_enforce: + raise osv.except_osv(_('Error'), balance_start_enforce_err) + else: + statement['coda_note'] = balance_start_enforce_err data = { 'name': '[' + statement['date'] + ']' + statement['description'], 'date': statement['date'], From 73ba51f7af51c713b462b8bc766a0e7b6eef14ad Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Mon, 10 Dec 2012 15:06:20 +0100 Subject: [PATCH 28/32] [DEL]Transaction families, code, types, categories, communication types, check balance end option bzr revid: dle@openerp.com-20121210140620-upq370zuvsetoojw --- addons/l10n_be_coda/l10n_be_coda.py | 8 - addons/l10n_be_coda/l10n_be_coda_view.xml | 12 - addons/l10n_be_coda/l10n_be_coda_wizard.xml | 1 - .../wizard/account_coda_import.py | 526 +----------------- 4 files changed, 6 insertions(+), 541 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py index 0b8bbf1bc24..40792dd3d24 100644 --- a/addons/l10n_be_coda/l10n_be_coda.py +++ b/addons/l10n_be_coda/l10n_be_coda.py @@ -29,14 +29,6 @@ class account_bank_statement(osv.osv): 'coda_note': fields.text('CODA Notes'), } - -class res_bank(osv.osv): - _inherit = 'res.partner.bank' - _columns = { - 'balance_start_enforce': fields.boolean('Prevent invalid Opening Balances', - help="Do not process Statements with an Opening Balance that doesn't match the previous Closing Balance."), - } - account_bank_statement() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 4cb863d234a..2464e5e9082 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -13,18 +13,6 @@ - - res.partner.bank.coda.form - res.partner.bank - - - - - - - - - bank.statement.line.coda.form account.bank.statement.line diff --git a/addons/l10n_be_coda/l10n_be_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml index dddc18bb30a..6e53a4d2ff0 100644 --- a/addons/l10n_be_coda/l10n_be_coda_wizard.xml +++ b/addons/l10n_be_coda/l10n_be_coda_wizard.xml @@ -10,7 +10,6 @@
-