MT940: Zeichensatz der Datei bei Import auswählen können

diff --git a/SL/Controller/BankImport.pm b/SL/Controller/BankImport.pm
index 04d72d368a03b11f3bc0bf048663a35a4deeeabc..1b20deca3b8a2705506c38b1aba1dedc044ab44b 100644 (file)
--- a/SL/Controller/BankImport.pm
+++ b/SL/Controller/BankImport.pm
@@ -16,7 +16,7 @@ use SL::SessionFile::Random;
 
 use Rose::Object::MakeMethods::Generic
 (
-  scalar                  => [ qw(file_name transactions statistics) ],
+  scalar                  => [ qw(file_name transactions statistics charset) ],
   'scalar --get_set_init' => [ qw(bank_accounts) ],
 );
 
@@ -43,6 +43,7 @@ sub action_import_mt940_preview {
   $file->fh->print($::form->{file});
   $file->fh->close;
 
+  $self->charset($::form->{charset});
   $self->file_name($file->file_name);
   $self->parse_and_analyze_transactions;
 
@@ -56,6 +57,7 @@ sub action_import_mt940 {
   die "missing file for action import_mt940" unless $::form->{file_name};
 
   $self->file_name($::form->{file_name});
+  $self->charset($::form->{charset});
   $self->parse_and_analyze_transactions;
   $self->import_transactions;
 
@@ -71,7 +73,7 @@ sub parse_and_analyze_transactions {
 
   my $currency_id = SL::DB::Default->get->currency_id;
 
-  $self->transactions([ sort { $a->{transdate} cmp $b->{transdate} } SL::MT940->parse($self->file_name) ]);
+  $self->transactions([ sort { $a->{transdate} cmp $b->{transdate} } SL::MT940->parse($self->file_name, charset => $self->charset) ]);
 
   foreach my $transaction (@{ $self->transactions }) {
     $transaction->{bank_account}   = $self->bank_accounts->{ make_bank_account_idx($transaction->{local_bank_code}, $transaction->{local_account_number}) };

diff --git a/SL/MT940.pm b/SL/MT940.pm
index dd965deeab01f052bafe42e21ece0073f4497ced..2a97e5e797461d5e585057a0757ab95a69a19e2e 100644 (file)
--- a/SL/MT940.pm
+++ b/SL/MT940.pm
@@ -24,7 +24,7 @@ sub _join_entries {
 }
 
 sub parse {
-  my ($class, $file_name) = @_;
+  my ($class, $file_name, %params) = @_;
 
   my ($local_bank_code, $local_account_number, %transaction, @transactions, @lines);
   my $line_number = 0;
@@ -40,7 +40,7 @@ sub parse {
   my ($active_field);
   foreach my $line (read_file($file_name)) {
     chomp $line;
-    $line = Encode::decode('UTF-8', $line);
+    $line = Encode::decode($params{charset} // 'UTF-8', $line);
     $line =~ s{\r+}{};
     $line_number++;
 

diff --git a/locale/de/all b/locale/de/all
index 23c8fccca6ac6d80df572255c56fa8aa4ac93722..878561b19e3185ec6c0f6eaf62657118d4190d61 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1680,7 +1680,6 @@ $self->{texts} = {
   'Import CSV'                  => 'CSV-Import',
   'Import Status'               => 'Import Status',
   'Import a Factur-X/ZUGFeRD file:' => 'Eine Factur-X-/ZUGFeRD-Datei importieren',
-  'Import a MT940 file:'        => 'Laden Sie eine MT940 Datei hoch:',
   'Import all'                  => 'Importiere Alle',
   'Import documents from #1'    => 'Importiere Dateien von Quelle \'#1\'',
   'Import file'                 => 'Import-Datei',
@@ -1929,6 +1928,7 @@ $self->{texts} = {
   'MAILED'                      => 'Gesendet',
   'MD'                          => 'PT',
   'MIME type'                   => 'MIME-Typ',
+  'MT940 file'                  => 'MT940-Datei',
   'MT940 import'                => 'MT940 Import',
   'MT940 import preview'        => 'MT940-Import-Vorschau',
   'MT940 import result'         => 'MT940-Import-Ergebnis',

diff --git a/templates/webpages/bank_import/import_mt940.html b/templates/webpages/bank_import/import_mt940.html
index b08eaa83ab845c6d5b80cbe4d9df46ccab81c298..e2baa5febe0109533ffbc6507a5d83c18c30055d 100644 (file)
--- a/templates/webpages/bank_import/import_mt940.html
+++ b/templates/webpages/bank_import/import_mt940.html
@@ -8,6 +8,7 @@
 [% IF preview %]
   <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
     [% L.hidden_tag('file_name', SELF.file_name) %]
+    [% L.hidden_tag('charset', SELF.charset) %]
   </form>
 [% END %]
 

diff --git a/templates/webpages/bank_import/upload_mt940.html b/templates/webpages/bank_import/upload_mt940.html
index b45185603b0cabbd51d315287715be709f815095..7d3233f5b97969acb0e40cbf033d19aa9dd3cb73 100644 (file)
--- a/templates/webpages/bank_import/upload_mt940.html
+++ b/templates/webpages/bank_import/upload_mt940.html
@@ -7,10 +7,16 @@
 
 <h1>[% FORM.title %]</h1>
 
-<p>
-  [% "Import a MT940 file:" | $T8 %]
-</p>
-
 <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
-  [% L.input_tag('file', '', type => 'file', accept => '*') %]
+  <table>
+    <tr>
+      <td>[% LxERP.t8("Charset") %]:</td>
+      <td>[% L.select_tag('charset', [ [ 'ISO-8859-15', 'ISO-8859-15 (Latin 1)' ], [ 'UTF-8', 'UTF-8' ], [ 'Windows-1252', 'Windows-1252' ] ], default='UTF-8') %]</td>
+    </tr>
+
+    <tr>
+      <td>[% LxERP.t8("MT940 file") %]:</td>
+      <td>[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>
+    </tr>
+  </table>
 </form>