Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / SL / Helper / ShippedQty.pm

diff --git a/SL/Helper/ShippedQty.pm b/SL/Helper/ShippedQty.pm
index 383a3a3fca4467c2f8f6536456d6c7bf8ed6c32d..6b878a972d54f43a75fe2b936c58c70728798a80 100644 (file)
--- a/SL/Helper/ShippedQty.pm
+++ b/SL/Helper/ShippedQty.pm
@@ -162,9 +162,9 @@ sub init_require_stock_out    { $::instance_conf->get_shipped_qty_require_stock_
 
 sub init_services_deliverable  {
   my ($self) = @_;
-  if ($::form->{type} =~ m/^sales_/ || $self->{objects}->[0]->{customer_id}) {
+  if (($::form->{type}//'') =~ m/^sales_/ || $self->{objects}->[0]->{customer_id}) {
     $::instance_conf->get_sales_delivery_order_check_service;
-  } elsif ($::form->{type} =~ m/^purchase_/ || $self->{objects}->[0]->{vendor_id}) {
+  } elsif (($::form->{type}//'') =~ m/^purchase_/ || $self->{objects}->[0]->{vendor_id}) {
     $::instance_conf->get_purchase_delivery_order_check_service;
   } else {
     croak "wrong call, no customer or vendor object referenced";