From 67aef2578aefd9387300b2b76f50b6d86ba18bd7 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 16 May 2017 22:35:34 +0200 Subject: [PATCH] [FIX+imp] account_check_deposit: no auto-post move + use the bank journal if the offsetting account is the bank account --- account_check_deposit/models/account_deposit.py | 13 ++++++++----- account_check_deposit/tests/test_check_deposit.py | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/account_check_deposit/models/account_deposit.py b/account_check_deposit/models/account_deposit.py index c3ad7628d..1aa2ceaaf 100644 --- a/account_check_deposit/models/account_deposit.py +++ b/account_check_deposit/models/account_deposit.py @@ -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 diff --git a/account_check_deposit/tests/test_check_deposit.py b/account_check_deposit/tests/test_check_deposit.py index 351152c07..b56e22ab1 100644 --- a/account_check_deposit/tests/test_check_deposit.py +++ b/account_check_deposit/tests/test_check_deposit.py @@ -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')