X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=5b093422175de63db6a9ace931e9e16185e2215d;hb=64c39b744b9fba960b32315ac7ea36477c85e8a5;hp=31db0a77ac3df95081171b9af4fb5851a7d5bf2d;hpb=9bb62875bf8b1f19b5a68d080806a09fc82ecc97;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index 31db0a77a..5b0934221 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})); @@ -970,7 +970,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 {