DATEV: Umsatz von 0 zulassen

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

diff --git a/SL/DATEV/CSV.pm b/SL/DATEV/CSV.pm
index c06ee704031fc1865ac152b916871cc0b38740d3..6ac460c442cfd09d436b1cd57bad4a54e5e7bb37 100644 (file)
--- a/SL/DATEV/CSV.pm
+++ b/SL/DATEV/CSV.pm
@@ -22,7 +22,7 @@ my @kivitendo_to_datev = (
                               max_length      => 13,
                               type            => 'Value',
                               required        => 1,
-                              input_check     => sub { my ($input) = @_; return (looks_like_number($input) && length($input) <= 13 && $input > 0) },
+                              input_check     => sub { my ($input) = @_; return (looks_like_number($input) && length($input) <= 13 && $input >= 0) },
                               formatter       => \&_format_amount,
                               valid_check     => sub { my ($check) = @_; return ($check =~ m/^\d{1,10}(\,\d{1,2})?$/) },
                             },
@@ -231,10 +231,10 @@ my @kivitendo_to_datev = (
                               input_check     => sub {
                                                        my ($ustid) = @_;
                                                        return 1 if ('' eq $ustid);
-                                                       $ustid =~ s{\s+}{}g;
+                                                       $ustid =~ s{[\s.]+}{}g;
                                                        return ($ustid =~ m/^CH|^[A-Z]{2}\w{5,13}$/);
                                                      },
-                              formatter       => sub { my ($input) = @_; $input =~ s/\s//g; return $input },
+                              formatter       => sub { my ($input) = @_; $input =~ s/[\s.]+//g; return $input },
                               valid_check     => sub {
                                                        my ($ustid) = @_;
                                                        return 1 if ('' eq $ustid);