From 12b522fa1375e36d6985663f5679abd05303ee45 Mon Sep 17 00:00:00 2001 From: Werner Hahn Date: Wed, 23 Jan 2019 16:58:59 +0100 Subject: [PATCH] =?utf8?q?Kontoauszugsimport=202=20Konten=20bei=20einer=20?= =?utf8?q?Bank.=20Bankgeb=C3=BChrenbuchung=20wird=20als=20schon=20importie?= =?utf8?q?rt=20makiert=20Fix=20f=C3=BCr=20#367?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/CsvImport/BankTransaction.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SL/Controller/CsvImport/BankTransaction.pm b/SL/Controller/CsvImport/BankTransaction.pm index 3e04d3bd6..db22be063 100644 --- a/SL/Controller/CsvImport/BankTransaction.pm +++ b/SL/Controller/CsvImport/BankTransaction.pm @@ -74,8 +74,9 @@ sub check_existing { # * transdate # * remote_account_number (may be empty for records of our own bank) # * amount + # * local_bank_account_id (case flatrate bank charges for two accounts in one bank: same purpose, transdate, remote_account_number(empty), amount. Just different local_bank_account_id) my $num; - if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, purpose => $object->purpose, amount => $object->amount] ) ) { + if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, purpose => $object->purpose, amount => $object->amount, local_bank_account_id => $object->local_bank_account_id] ) ) { push(@{$entry->{errors}}, $::locale->text('Skipping due to existing bank transaction in database')); }; } else { -- 2.20.1