Zahlungsbedingungen bei Lieferscheinen; veraltete Spalte »terms« entfernt

[mfinanz.git] / SL / Controller / CsvImport / BankTransaction.pm

diff --git a/SL/Controller/CsvImport/BankTransaction.pm b/SL/Controller/CsvImport/BankTransaction.pm
index 76e9020afb59a5e3722690a98988e6c4695c2679..2f92dd773afa721826dc5b0ffc1358770a908fb5 100644 (file)
--- a/SL/Controller/CsvImport/BankTransaction.pm
+++ b/SL/Controller/CsvImport/BankTransaction.pm
@@ -15,6 +15,15 @@ use Rose::Object::MakeMethods::Generic
  'scalar --get_set_init' => [ qw(bank_accounts_by) ],
 );
 
  'scalar --get_set_init' => [ qw(bank_accounts_by) ],
 );
 

+sub set_profile_defaults {
+  my ($self) = @_;
+
+  $self->controller->profile->_set_defaults(
+                       charset       => 'UTF8',  # override charset from defaults
+                       update_policy => 'skip',
+                      );
+};
+

 sub init_class {
   my ($self) = @_;
   $self->class('SL::DB::BankTransaction');
 sub init_class {
   my ($self) = @_;
   $self->class('SL::DB::BankTransaction');


@@ -131,7 +140,7 @@ sub check_bank_account {
       return 0;
     }
     if ($entry->{raw_data}->{local_bank_code} && $entry->{raw_data}->{local_bank_code} ne $bank_account->bank_code) {
       return 0;
     }
     if ($entry->{raw_data}->{local_bank_code} && $entry->{raw_data}->{local_bank_code} ne $bank_account->bank_code) {

-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid local bank account');
+      push @{ $entry->{errors} }, $::locale->text('Error: Found local bank account number but local bank code doesn\'t match') . ": " . $entry->{raw_data}->{local_bank_code};

       return 0;
     }
 
       return 0;
     }