X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=c59f9eee89960e29e0bc8eff1b34b88f6d1e4c72;hb=78c8b931b0081dc5c082615c6dac24b7d8f6ff7f;hp=e36b7f398f1b2339be59feb188a6a5e2b07f3fc8;hpb=6ff01fdb61880344c2826c86955ef4c1e8f47db4;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index e36b7f398..c59f9eee8 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -855,7 +855,8 @@ sub get_vendor { : "current_date"; # get vendor - @values = (); + my @values = (); + my $where = ''; if ($vid) { $where .= 'AND v.id = ?'; push @values, $vid; @@ -866,7 +867,7 @@ sub get_vendor { } my $query = qq|SELECT - v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount, + v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount, v.creditlimit, v.terms, v.notes AS intnotes, v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.street, v.zipcode, v.city, v.country, v.taxzone_id, @@ -976,7 +977,7 @@ sub retrieve_item { $where .= qq| OR (NOT p.obsolete = '1' AND p.ean = ? )|; push @values, $form->{"partnumber_$i"}; } - + if ($form->{"description_$i"}) { $where .= " ORDER BY p.description"; } else {