Auftrags-Controller: Verkäufer bei Kundenwechsel ändern

[mfinanz.git] / SL / DATEV / CSV.pm

diff --git a/SL/DATEV/CSV.pm b/SL/DATEV/CSV.pm
index 6d6594582776653de1c96011a9029ad1921c049e..69448c49f27519a724149b9d38dd8b7b00ccbb42 100644 (file)
--- a/SL/DATEV/CSV.pm
+++ b/SL/DATEV/CSV.pm
@@ -119,7 +119,7 @@ my @kivitendo_to_datev = (
                               type            => 'Value',
                             },
                             {
                               type            => 'Value',
                             },
                             {

-                              kivi_datev_name => 'buchungsbes',
+                              kivi_datev_name => 'buchungstext',

                               csv_header_name => t8('Posting Text'),
                               max_length      => 60,
                               type            => 'Text',
                               csv_header_name => t8('Posting Text'),
                               max_length      => 60,
                               type            => 'Text',


@@ -228,7 +228,12 @@ my @kivitendo_to_datev = (
                               max_length      => 15,
                               type            => 'Text',
                               default         => '',
                               max_length      => 15,
                               type            => 'Text',
                               default         => '',

-                              input_check     => sub { my ($check) = @_; return ($check eq '' || $check =~ m/[A-Z]{2}\w{5,13}/) },
+                              input_check     => sub {
+                                                       my ($ustid) = @_;
+                                                       return 1 if ('' eq $ustid);
+                                                       $ustid =~ s{\s+}{}g;
+                                                       return ($ustid =~ m/^CH|^[A-Z]{2}\w{5,13}$/);
+                                                     },

                               formatter       => sub { my ($input) = @_; $input =~ s/\s//g; return $input },
                               valid_check     => sub {
                                                        my ($ustid) = @_;
                               formatter       => sub { my ($input) = @_; $input =~ s/\s//g; return $input },
                               valid_check     => sub {
                                                        my ($ustid) = @_;


@@ -294,7 +299,7 @@ sub header {
   }
 
   my @header_row_1 = (
   }
 
   my @header_row_1 = (

-    "EXTF", "300", 21, "Buchungsstapel", 7, $created_on, "", "ki",
+    "EXTF", "510", 21, "Buchungsstapel", 7, $created_on, "", "ki",

     "kivitendo-datev", "", $meta_datev{beraternr}, $meta_datev{mandantennr},
     $self->first_day_of_fiscal_year->ymd(''), $length_of_accounts,
     $self->from->ymd(''), $self->to->ymd(''), "", "", 1, "", $self->locked,
     "kivitendo-datev", "", $meta_datev{beraternr}, $meta_datev{mandantennr},
     $self->first_day_of_fiscal_year->ymd(''), $length_of_accounts,
     $self->from->ymd(''), $self->to->ymd(''), "", "", 1, "", $self->locked,