|
|
@ -170,11 +170,10 @@ class AccountBankStatementImport(models.TransientModel): |
|
|
|
|
|
|
|
@api.model |
|
|
|
def _get_journal(self, currency_id, bank_account_id, account_number): |
|
|
|
""" Find or create the journal """ |
|
|
|
""" Find the journal """ |
|
|
|
bank_model = self.env['res.partner.bank'] |
|
|
|
|
|
|
|
# Find the journal from context or bank account |
|
|
|
journal_id = self.env.context.get('journal_id') |
|
|
|
# Find the journal from context, wizard or bank account |
|
|
|
journal_id = self.env.context.get('journal_id') or self.journal_id.id |
|
|
|
if bank_account_id: |
|
|
|
bank_account = bank_model.browse(bank_account_id) |
|
|
|
if journal_id: |
|
|
@ -188,7 +187,6 @@ class AccountBankStatementImport(models.TransientModel): |
|
|
|
else: |
|
|
|
if bank_account.journal_id.id: |
|
|
|
journal_id = bank_account.journal_id.id |
|
|
|
|
|
|
|
# If importing into an existing journal, its currency must be the same |
|
|
|
# as the bank statement |
|
|
|
if journal_id: |
|
|
@ -197,12 +195,10 @@ class AccountBankStatementImport(models.TransientModel): |
|
|
|
if currency_id and currency_id != journal_currency_id: |
|
|
|
raise Warning(_('The currency of the bank statement is not ' |
|
|
|
'the same as the currency of the journal !')) |
|
|
|
|
|
|
|
# If we couldn't find/create a journal, everything is lost |
|
|
|
if not journal_id: |
|
|
|
raise Warning(_('Cannot find in which journal import this ' |
|
|
|
'statement. Please manually select a journal.')) |
|
|
|
|
|
|
|
return journal_id |
|
|
|
|
|
|
|
@api.model |
|
|
|