X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=931df6b4487849d59318ca6814843200f7f7df65;hb=b6213d3539ccd179cd1f21b9afc54b8de8970774;hp=301fe3b646e8ebc5e9cbe82f95e031c32d289658;hpb=81b492ac44ad8fc5207a9072039b972fb954c4dd;p=kivitendo-erp.git

diff --git a/SL/IR.pm b/SL/IR.pm
index 301fe3b64..931df6b44 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -720,9 +720,10 @@ sub post_invoice {
   }
 
 
-  # add shipto
   $form->{name} = $form->{vendor};
   $form->{name} =~ s/--\Q$form->{vendor_id}\E//;
+
+  # add shipto
   $form->add_shipto($dbh, $form->{id}, "AP");
 
   # delete zero entries
@@ -1126,16 +1127,6 @@ sub get_vendor {
   }
   $sth->finish();
 
-  # get shipto if we do not convert an order or invoice
-  if (!$params->{shipto}) {
-    delete @{$params}{qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail)};
-
-    $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module= 'CT')|;
-    $ref = selectfirst_hashref_query($form, $dbh, $query, $vid);
-    @{$params}{keys %$ref} = @{$ref}{keys %$ref};
-    map { $params->{$_} = $ref->{$_} } keys %$ref;
-  }
-
   if (!$params->{id} && $params->{type} !~ /_(order|quotation)/) {
     # setup last accounts used
     $query =