X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=4c57f856d6f312e2fa3c4405c94c07d729add308;hb=a325f1b7554914418f885c43211099baa0ce083c;hp=31db0a77ac3df95081171b9af4fb5851a7d5bf2d;hpb=9bb62875bf8b1f19b5a68d080806a09fc82ecc97;p=kivitendo-erp.git

diff --git a/SL/IR.pm b/SL/IR.pm
index 31db0a77a..4c57f856d 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -523,7 +523,7 @@ sub post_invoice {
     do_query($form, $dbh, $query, conv_i($form->{storno_id}));
 
     $query = qq!UPDATE ap SET intnotes = ? || intnotes WHERE id = ?!;
-    do_query($form, $dbh, $query, 'Rechnung storniert am $form->{invdate} ', conv_i($form->{storno_id}));
+    do_query($form, $dbh, $query, "Rechnung storniert am $form->{invdate} ", conv_i($form->{storno_id}));
 
     $query = qq|UPDATE ap SET paid = amount WHERE id = ?|;
     do_query($form, $dbh, $query, conv_i($form->{id}));
@@ -866,7 +866,8 @@ sub get_vendor {
   }
   my $query =
     qq|SELECT
-         v.id AS vendor_id, v.name AS vendor, v.creditlimit, v.terms, v.notes AS intnotes,
+         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,
          $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
@@ -970,7 +971,12 @@ sub retrieve_item {
     $where .= " AND lower(${table_column}) LIKE lower(?)";
     push @values, '%' . $form->{"${field}_${i}"} . '%';
   }
-
+  #Es soll auch nach EAN gesucht werden, ohne Einschränkung durch Beschreibung
+  if ($form->{"partnumber_$i"} && !$form->{"description_$i"}) {
+      $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 {