odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[ADD]Balance check 

bzr revid: dle@openerp.com-20121210133334-jxepuwxf9safyeur
This commit is contained in:
dle@openerp.com 2012-12-10 14:33:34 +01:00
parent 54a39ac1b1
commit 257db6feff
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/l10n_be_coda/l10n_be_coda.py
View File

@ -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()

15
addons/l10n_be_coda/wizard/account_coda_import.py
View File

@ -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'],