[FIX]Syntax according to sublime-linter, remove of unused variables
bzr revid: dle@openerp.com-20121203102112-jsxy7th8v0bfolv4
This commit is contained in:
dle@openerp.com
parent
fe3327fb42
commit
2bfd5ecdf7
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue