X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=1dde56f74cd29d79e23776a489dea94d650998ae;hb=3270e88361efc8ceff21314b489732229f0f98f7;hp=e465224b8a7a2a03f6235281bdbc263ee034015a;hpb=6f1b36cfb8b26f6c8540ba5f36e48b9188d9470a;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index e465224b8..1dde56f74 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -1199,8 +1199,8 @@ sub retrieve_item { # also search hits in makemodels, but only cache the results by id and merge later my $mm_query = qq| - SELECT parts_id, model FROM makemodel - LEFT JOIN parts ON parts.id = parts_id + SELECT parts_id, model FROM makemodel + LEFT JOIN parts ON parts.id = parts_id WHERE NOT parts.obsolete AND model ILIKE ? AND (make IS NULL OR make = ?); |; my $mm_results = selectall_hashref_query($::form, $dbh, $mm_query, '%' . $form->{"partnumber_$i"} . '%', $::form->{vendor_id}); @@ -1268,7 +1268,7 @@ sub retrieve_item { WHERE id = p.buchungsgruppen_id) = c1.id) LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id - FROM taxzone_charts tc + FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id) LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id