Sortierung in Berichten über Ausgangsrechnungen/Debitorenbuchungen auch auf- und...

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index f45d958..d155a0d 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -41,6 +41,7 @@ use Data::Dumper;
 use CGI;
 use CGI::Ajax;
 use Cwd;
+use IO::File;
 use SL::Auth;
 use SL::Auth::DB;
 use SL::Auth::LDAP;
@@ -470,7 +471,7 @@ sub isblank {
   my ($self, $name, $msg) = @_;
 
   my $curr = $self;
-  foreach my $part (split /\./, $name) {
+  foreach my $part (split m/\./, $name) {
     if (!$curr->{$part} || ($curr->{$part} =~ /^\s*$/)) {
       $self->error($msg);
     }
@@ -729,13 +730,26 @@ sub parse_html_template {
 
   map { $additional_params->{$_} ||= $self->{$_} } keys %{ $self };
 
+  my $in = IO::File->new($file, 'r');
+
+  if (!$in) {
+    print STDERR "Error opening template file: $!";
+    $main::lxdebug->leave_sub();
+    return '';
+  }
+
+  my $input = join('', <$in>);
+  $in->close();
+
+  if ($main::locale) {
+    $input = $main::locale->{iconv}->convert($input);
+  }
+
   my $output;
-  if (!$template->process($file, $additional_params, \$output)) {
+  if (!$template->process(\$input, $additional_params, \$output)) {
     print STDERR $template->error();
   }
 
-  $output = $main::locale->{iconv}->convert($output) if ($main::locale);
-
   $main::lxdebug->leave_sub();
 
   return $output;
@@ -919,16 +933,19 @@ sub format_amount_units {
   my $self             = shift;
   my %params           = @_;
 
-  Common::check_params(\%params, qw(amount part_unit));
-
   my $myconfig         = \%main::myconfig;
-  my $amount           = $params{amount};
+  my $amount           = $params{amount} * 1;
   my $places           = $params{places};
   my $part_unit_name   = $params{part_unit};
   my $amount_unit_name = $params{amount_unit};
   my $conv_units       = $params{conv_units};
   my $max_places       = $params{max_places};
 
+  if (!$part_unit_name) {
+    $main::lxdebug->leave_sub();
+    return '';
+  }
+
   AM->retrieve_all_units();
   my $all_units        = $main::all_units;
 
@@ -1897,6 +1914,12 @@ sub _get_contacts {
 
   $key = "all_contacts" unless ($key);
 
+  if (!$id) {
+    $self->{$key} = [];
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
   my $query =
     qq|SELECT cp_id, cp_cv_id, cp_name, cp_givenname, cp_abteilung | .
     qq|FROM contacts | .
@@ -1965,10 +1988,15 @@ sub _get_shipto {
 
   $key = "all_shipto" unless ($key);
 
-  # get shipping addresses
-  my $query = qq|SELECT * FROM shipto WHERE trans_id = ?|;
+  if ($vc_id) {
+    # get shipping addresses
+    my $query = qq|SELECT * FROM shipto WHERE trans_id = ?|;
+
+    $self->{$key} = selectall_hashref_query($self, $dbh, $query, $vc_id);
 
-  $self->{$key} = selectall_hashref_query($self, $dbh, $query, $vc_id);
+  } else {
+    $self->{$key} = [];
+  }
 
   $main::lxdebug->leave_sub();
 }