DATEV::CSV safer order of libs

[kivitendo-erp.git] / SL / DATEV / CSV.pm

diff --git a/SL/DATEV/CSV.pm b/SL/DATEV/CSV.pm
index 8c15375..c11a9b5 100644 (file)
--- a/SL/DATEV/CSV.pm
+++ b/SL/DATEV/CSV.pm
@@ -4,10 +4,10 @@ use strict;
 
 use SL::Locale::String qw(t8);
 use SL::DB::Datev;
+use DateTime; # safer before the Helper
 use SL::Helper::DateTime;
 
 use Carp;
-use DateTime;
 use Encode qw(decode);
 use Scalar::Util qw(looks_like_number);
 
@@ -20,7 +20,7 @@ my @kivitendo_to_datev = (
                               type            => 'Value',
                               required        => 1,
                               input_check     => sub { my ($input) = @_; return (looks_like_number($input) && length($input) <= 13) },
-                              formatter       => sub { my ($input) = @_; return _format_amount($input) },
+                              formatter       => \&_format_amount,
                               valid_check     => sub { my ($check) = @_; return ($check =~ m/^\d{1,10}(\,\d{1,2})?$/) },
                             },
                             {
@@ -304,6 +304,7 @@ sub _generate_csv_header {
   my $datev = SL::DB::Manager::Datev->get_first();
 
   while (my ($k, $v) = each %meta_datev_to_valid_length) {
+    next unless $datev->{$k};
     $meta_datev{$k} = substr $datev->{$k}, 0, $v;
   }