/ - Diff - projekt kivitendo - wissen

     use Rose::Object::MakeMethods::Generic
+    (
       scalar                  => [ qw(file_name transactions statistics charset) ],
       scalar                  => [ qw(file_name transactions statistics charset space_in_reference) ],
       'scalar --get_set_init' => [ qw(bank_accounts) ],
     );
-...
       $file->fh->close;
       $self->charset($::form->{charset});
       $self->space_in_reference($::form->{space_in_reference} // 1);
       $self->file_name($file->file_name);
       $self->parse_and_analyze_transactions;
-...
       $self->file_name($::form->{file_name});
       $self->charset($::form->{charset});
       $self->space_in_reference($::form->{space_in_reference});
       $self->parse_and_analyze_transactions;
       $self->import_transactions;
-...
       my $currency_id = SL::DB::Default->get->currency_id;
       $self->transactions([ sort { $a->{transdate} cmp $b->{transdate} } SL::MT940->parse($self->file_name, charset => $self->charset) ]);
       my @transactions = SL::MT940->parse(
         $self->file_name,
         charset            => $self->charset,
         space_in_reference => $self->space_in_reference,
       );
       $self->transactions([ sort { $a->{transdate} cmp $b->{transdate} } @transactions ]);
       foreach my $transaction (@{ $self->transactions }) {
         $transaction->{bank_account}   = $self->bank_accounts->{ make_bank_account_idx($transaction->{local_bank_code}, $transaction->{local_account_number}) };

+    }
     sub _join_entries_sepa {
       my ($parts) = @_;
       my ($parts, $separator) = @_;
       my $line = '';
       foreach my $field (grep { $_ } map  { $parts->{$_} } (20..29)) {
         if (($line ne '') && ($field =~ m{^[A-Z]+\+})) {
           $line .= ' ';
         } elsif ($line ne '') {
           $line .= $separator;
+        }
         $line .= $field;
+      }
-...
+    }
     sub _join_entries_austria {
       my ($parts) = @_;
       my ($parts, $separator) = @_;
       return _join_entries($parts, 20, 23, ' ');
       return join ' ',
         grep { $_ }
         (_join_entries($parts, 20, 21, $separator),
          _join_entries($parts, 22, 23, $separator));
+    }
     sub parse {
-...
+        }
+      }
       my $sub_field_separator = $params{space_in_reference} ? ' ' : '';
       foreach my $line (@lines) {
         # AT MT940 has the format  :25://AT20151/00797453990/EUR
         # DE MT940 has the format  :25:BLZ/Konto
-...
             my $is_sepa    = !$is_austria && ($code =~ m{^1});
             my %parts      = map { ((substr($_, 0, 2) // '0') * 1 => substr($_, 2)) } split quotemeta($separator), $rest;
             $transaction{purpose}               = $is_sepa    ? _join_entries_sepa(\%parts)
                                                 : $is_austria ? _join_entries(\%parts, 20, 23, ' ')
                                                 :               _join_entries(\%parts, 20, 29);
             $transaction{purpose}               = $is_sepa    ? _join_entries_sepa(\%parts, $sub_field_separator)
                                                 : $is_austria ? _join_entries_austria(\%parts, $sub_field_separator)
                                                 :               _join_entries(\%parts, 20, 29, $sub_field_separator);
             $transaction{remote_name}           = _join_entries(\%parts, 32, 33);
             $transaction{remote_bank_code}      = $parts{30};
             $transaction{remote_account_number} = $parts{31};

       'Do not check for duplicates' => 'Nicht nach Dubletten suchen',
       'Do not create Factur-X/ZUGFeRD invoices' => 'Keine Factur-X-/ZUGFeRD-Rechnungen erzeugen',
       'Do not create QR-bill invoices' => 'Keine QR-Rechnungen erzeugen',
       'Do not insert an extra space between sub-fields of the reference field' => 'Keine Leerzeichen zwischen Unterfeldern des Verwendungszwecks einfügen',
       'Do not leave booking form?'  => 'Buchungsmaske nicht verlassen?',
       'Do not link to a project.'   => 'Nicht mit einem Projekt verknüpfen.',
       'Do not modify this position' => 'Diese Position nicht verändern',
-...
       'Input to string: #1'         => 'Eingabe Bis-Zeichenkete: #1',
       'Insert'                      => 'Einfügen',
       'Insert Date'                 => 'Erfassungsdatum',
       'Insert an extra space between sub-fields of the reference field' => 'Leerzeichen zwischen Unterfeldern des Verwendungszwecks einfügen',
       'Insert new'                  => 'Hinzufügen',
       'Insert with new customer/vendor number' => 'Mit neuer Kunden-/Lieferantennummer anlegen',
       'Insert with new database ID' => 'Neu anlegen mit neuer Datenbank-ID',
-...
       'Source bank account'         => 'Quellkonto',
       'Source bin'                  => 'Quelllagerplatz',
       'Space'                       => 'Leerzeichen',
       'Spaces in reference field'   => 'Leerzeichen im Verwendungszweck',
       'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software kivitendo does not allow these.' => 'Splitbuchung! Die eingebenen Werte würden eine Buchung auslösen, die jeweils mehr als eine Position auf Soll und Haben hätte. Um Kompatibilität mit DATEV zu gewährleisten erlaubt kivitendo keine Splitbuchungen.',
       'Spoolfile'                   => 'Druckdatei',
       'Staff member must not be empty.' => 'Mitarbeiter darf nicht leer sein.',

templates/design40_webpages/bank_import/import_mt940.html
9	9	<form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
10	10	[% L.hidden_tag('file_name', SELF.file_name) %]
11	11	[% L.hidden_tag('charset', SELF.charset) %]
	12	[% L.hidden_tag('space_in_reference', SELF.space_in_reference) %]
12	13	</form>
13	14	[% END %]
14	15

     <div class="wrapper">
       <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
         <table class="tbl-horizontal">
         <caption>[% "Import a MT940 file:" | $T8 %]</caption>
           <caption>[% "Import a MT940 file:" | $T8 %]</caption>
           <tbody>
             <tr>
               <th>[% LxERP.t8("Charset") %]:</th>
-...
               <th>[% LxERP.t8("MT940 file") %]:</th>
               <td>[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>
             </tr>
         <tbody>
             <tr>
               <td>[% LxERP.t8("Spaces in reference field") %]:</td>
               <td>[% L.select_tag('space_in_reference', [ [ 0, LxERP.t8('Do not insert an extra space between sub-fields of the reference field') ],
                                                           [ 1, LxERP.t8('Insert an extra space between sub-fields of the reference field') ] ], default=1) %]</td>
             </tr>
           <tbody>
         </table>
       </form>
     </div>

templates/webpages/bank_import/import_mt940.html
9	9	<form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
10	10	[% L.hidden_tag('file_name', SELF.file_name) %]
11	11	[% L.hidden_tag('charset', SELF.charset) %]
	12	[% L.hidden_tag('space_in_reference', SELF.space_in_reference) %]
12	13	</form>
13	14	[% END %]
14	15

           <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("Spaces in reference field") %]:</td>
           <td>[% L.select_tag('space_in_reference', [ [ 0, LxERP.t8('Do not insert an extra space between sub-fields of the reference field') ],
                                                       [ 1, LxERP.t8('Insert an extra space between sub-fields of the reference field') ] ], default=1) %]</td>
         </tr>
         <tr>
           <td>[% LxERP.t8("MT940 file") %]:</td>
           <td>[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>

Projekt

Allgemein

Profil

projekt kivitendo

Revision 8bb3b201

Von Moritz Bunkus vor mehr als 1 Jahr hinzugefügt