[FIX+imp] account_check_deposit: no auto-post move + use the bank journal if the offsetting account is the bank account

This commit is contained in:
Alexis de Lattre
2017-05-16 22:35:34 +02:00
committed by Pedro M. Baeza
parent c78402a1cc
commit 4effa380ee
2 changed files with 9 additions and 6 deletions

View File

@@ -155,10 +155,15 @@ class AccountCheckDeposit(models.Model):
@api.model
def _prepare_account_move_vals(self, deposit):
date = deposit.deposit_date
if (
deposit.company_id.check_deposit_offsetting_account ==
'bank_account'):
journal_id = deposit.bank_journal_id.id
else:
journal_id = deposit.journal_id.id
move_vals = {
'journal_id': deposit.journal_id.id,
'date': date,
'journal_id': journal_id,
'date': deposit.deposit_date,
'name': _('Check Deposit %s') % deposit.name,
'ref': deposit.name,
}
@@ -232,9 +237,7 @@ class AccountCheckDeposit(models.Model):
counter_vals['move_id'] = move.id
move_line_obj.create(counter_vals)
move.post()
deposit.write({'state': 'done', 'move_id': move.id})
# We have to reconcile after post()
for reconcile_lines in to_reconcile_lines:
reconcile_lines.reconcile()
return True

View File

@@ -189,5 +189,5 @@ class TestPayment(AccountingTestCase):
self.assertEqual(check_deposit.total_amount, 300)
self.assertEqual(liquidity_aml.debit, 300)
self.assertEqual(check_deposit.move_id.state, 'posted')
self.assertEqual(check_deposit.move_id.state, 'draft')
self.assertEqual(check_deposit.state, 'done')