X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=sql%2FPg-upgrade2%2Ferzeugnisnummern.pl;fp=sql%2FPg-upgrade2%2Ferzeugnisnummern.pl;h=8468e6922e3e8fbe29241d26d3a33aba36964f92;hp=326122eb8e4a0687b66cdfb2ee3be646fe703b47;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44 diff --git a/sql/Pg-upgrade2/erzeugnisnummern.pl b/sql/Pg-upgrade2/erzeugnisnummern.pl index 326122eb8..8468e6922 100644 --- a/sql/Pg-upgrade2/erzeugnisnummern.pl +++ b/sql/Pg-upgrade2/erzeugnisnummern.pl @@ -60,35 +60,34 @@ sub filter_parts { if ( $::form->{filter_partnumber} ) { $where .= ' AND partnumber ILIKE ?'; - push(@values, $::form->like( $::form->{filter_partnumber} )); + push(@values, like( $::form->{filter_partnumber} )); } if ($::form->{filter_description}) { $where .= ' AND description ILIKE ?'; - push(@values, $::form->like($::form->{filter_description})); + push(@values, like($::form->{filter_description})); } if ($::form->{filter_notes}) { $where .= ' AND notes ILIKE ?'; - push(@values, $::form->like($::form->{filter_notes})); + push(@values, like($::form->{filter_notes})); } if ($::form->{filter_ean}) { $where .= ' AND ean ILIKE ?'; - push(@values, $::form->like($::form->{filter_ean})); + push(@values, like($::form->{filter_ean})); } if ($::form->{filter_type} eq 'assembly') { - $where .= ' AND assembly'; + $where .= " AND part_type = 'assembly'"; } if ($::form->{filter_type} eq 'service') { - $where .= ' AND inventory_accno_id IS NULL AND NOT assembly'; + $where .= " AND part_type = 'service'"; } if ($::form->{filter_type} eq 'part') { - $where .= ' AND inventory_accno_id IS NOT NULL'; - $where .= ' AND NOT assembly'; + $where .= " AND part_type = 'part'"; } if ($::form->{filter_obsolete} eq 'obsolete') {