Revision 6f1b36cf
Von Sven Schöling vor mehr als 10 Jahren hinzugefügt
| SL/IR.pm | ||
|---|---|---|
| 1191 | 1191 |
$where .= " AND lower(${table_column}) LIKE lower(?)";
|
| 1192 | 1192 |
push @values, '%' . $form->{"${field}_${i}"} . '%';
|
| 1193 | 1193 |
} |
| 1194 |
#Es soll auch nach EAN gesucht werden, ohne Einschränkung durch Beschreibung |
|
| 1194 |
|
|
| 1195 |
my (%mm_by_id); |
|
| 1195 | 1196 |
if ($form->{"partnumber_$i"} && !$form->{"description_$i"}) {
|
| 1196 |
$where .= qq| OR (NOT p.obsolete = '1' AND p.ean = ? )|; |
|
| 1197 |
push @values, $form->{"partnumber_$i"};
|
|
| 1198 |
} |
|
| 1197 |
$where .= qq| OR (NOT p.obsolete = '1' AND p.ean = ? )|; |
|
| 1198 |
push @values, $form->{"partnumber_$i"};
|
|
| 1199 |
|
|
| 1200 |
# also search hits in makemodels, but only cache the results by id and merge later |
|
| 1201 |
my $mm_query = qq| |
|
| 1202 |
SELECT parts_id, model FROM makemodel |
|
| 1203 |
LEFT JOIN parts ON parts.id = parts_id |
|
| 1204 |
WHERE NOT parts.obsolete AND model ILIKE ? AND (make IS NULL OR make = ?); |
|
| 1205 |
|; |
|
| 1206 |
my $mm_results = selectall_hashref_query($::form, $dbh, $mm_query, '%' . $form->{"partnumber_$i"} . '%', $::form->{vendor_id});
|
|
| 1207 |
my @mm_ids = map { $_->{parts_id} } @$mm_results;
|
|
| 1208 |
push @{$mm_by_id{ $_->{parts_id} } ||= []}, $_ for @$mm_results;
|
|
| 1209 |
|
|
| 1210 |
if (@mm_ids) {
|
|
| 1211 |
$where .= qq| OR p.id IN (| . join(',', ('?') x @mm_ids) . qq|)|;
|
|
| 1212 |
push @values, @mm_ids; |
|
| 1213 |
} |
|
| 1214 |
} |
|
| 1199 | 1215 |
|
| 1200 | 1216 |
# Search for part ID overrides all other criteria. |
| 1201 | 1217 |
if ($form->{"id_${i}"}) {
|
| ... | ... | |
| 1227 | 1243 |
p.unit, p.assembly, p.onhand, p.formel, |
| 1228 | 1244 |
p.notes AS partnotes, p.notes AS longdescription, p.not_discountable, |
| 1229 | 1245 |
p.inventory_accno_id, p.price_factor_id, |
| 1246 |
p.ean, |
|
| 1230 | 1247 |
|
| 1231 | 1248 |
pfac.factor AS price_factor, |
| 1232 | 1249 |
|
| ... | ... | |
| 1278 | 1295 |
$form->{item_list} = [];
|
| 1279 | 1296 |
while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
|
| 1280 | 1297 |
|
| 1298 |
if ($mm_by_id{$ref->{id}}) {
|
|
| 1299 |
$ref->{makemodels} = $mm_by_id{$ref->{id}};
|
|
| 1300 |
push @{ $ref->{matches} ||= [] }, $::locale->text('Model') . ': ' . join ', ', map { $_->{model} } @{ $mm_by_id{$ref->{id}} };
|
|
| 1301 |
} |
|
| 1302 |
|
|
| 1303 |
if ($ref->{ean} eq $::form->{"partnumber_$i"}) {
|
|
| 1304 |
push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
|
|
| 1305 |
} |
|
| 1306 |
|
|
| 1281 | 1307 |
# In der Buchungsgruppe ist immer ein Bestandskonto verknuepft, auch wenn |
| 1282 | 1308 |
# es sich um eine Dienstleistung handelt. Bei Dienstleistungen muss das |
| 1283 | 1309 |
# Buchungskonto also aus dem Ergebnis rausgenommen werden. |
Auch abrufbar als: Unified diff
select_item: Belegmasken finden jetzt auch Warennummern aus makemodels
Außerdem die Präsentation von select_item angepasst, so dass ersichtlich
wird woher die gefundenen Waren stammen.