2 Warnungen in den Tests beseitigen

diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm
index 100652e15e985c070cce283bb9138bc9b3da10f4..34afeae54504abbb6dc1b319f7b626908cf27961 100644 (file)
--- a/SL/DBUpgrade2/Base.pm
+++ b/SL/DBUpgrade2/Base.pm
@@ -90,11 +90,9 @@ sub add_print_templates {
     croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_";
   }
 
     croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_";
   }
 

-  my $template_dir = $::instance_conf->reload->get_templates;
+  return 1 unless my $template_dir = $::instance_conf->reload->get_templates;

   $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir");
 
   $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir");
 

-  return 1 if !$template_dir;
-

   foreach my $src_file (@files) {
     my $dest_file = $template_dir . '/' . $src_file;
 
   foreach my $src_file (@files) {
     my $dest_file = $template_dir . '/' . $src_file;
 

diff --git a/SL/Form.pm b/SL/Form.pm
index f35327873d3ec8e0689689cd93f73ee5588e8656..7030454d6989cab2428bae6f3ff6bf438b9db4a1 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2365,8 +2365,13 @@ sub get_lists {
   my $dbh = $self->get_standard_dbh(\%main::myconfig);
   my ($sth, $query, $ref);
 
   my $dbh = $self->get_standard_dbh(\%main::myconfig);
   my ($sth, $query, $ref);
 

-  my $vc = $self->{"vc"} eq "customer" ? "customer" : "vendor";
-  my $vc_id = $self->{"${vc}_id"};
+  my ($vc, $vc_id);
+  if ($params{contacts} || $params{shipto}) {
+    $vc = 'customer' if $self->{"vc"} eq "customer";
+    $vc = 'vendor'   if $self->{"vc"} eq "vendor";
+    die "invalid use of get_lists, need 'vc'";
+    $vc_id = $self->{"${vc}_id"};
+  }

 
   if ($params{"contacts"}) {
     $self->_get_contacts($dbh, $vc_id, $params{"contacts"});
 
   if ($params{"contacts"}) {
     $self->_get_contacts($dbh, $vc_id, $params{"contacts"});