Revision 8b6ad9a4
Von Sven Schöling vor fast 13 Jahren hinzugefügt
SL/IC.pm | ||
---|---|---|
1007 | 1007 |
$joins_needed{apoe} = 1 if $joins_needed{cv} || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters; |
1008 | 1008 |
$joins_needed{invoice_oi} = 1 if $joins_needed{apoe} || grep { $form->{$_} || $form->{"l_$_"} } @invoice_oi_filters; |
1009 | 1009 |
|
1010 |
# in bsoorq, use qtys instead of onhand |
|
1011 |
if ($joins_needed{invoice_oi}) { |
|
1012 |
$renamed_columns{onhand} = 'onhand_before_bsooqr'; |
|
1013 |
$renamed_columns{qty} = 'onhand'; |
|
1014 |
} |
|
1015 |
|
|
1016 | 1010 |
# special case for description search. |
1017 | 1011 |
# up in the simple filter section the description filter got interpreted as something like: WHERE description ILIKE '%$form->{description}%' |
1018 | 1012 |
# now we'd like to search also for the masked description entered in orderitems and invoice, so... |
bin/mozilla/ic.pl | ||
---|---|---|
1043 | 1043 |
'listprice' => { 'text' => $locale->text('List Price'), }, |
1044 | 1044 |
'microfiche' => { 'text' => $locale->text('Microfiche'), }, |
1045 | 1045 |
'name' => { 'text' => $locale->text('Name'), }, |
1046 |
'onhand' => { 'text' => $locale->text('Qty'), }, |
|
1046 |
'onhand' => { 'text' => $locale->text('Stocked Qty'), },
|
|
1047 | 1047 |
'ordnumber' => { 'text' => $locale->text('Order Number'), }, |
1048 | 1048 |
'partnumber' => { 'text' => $locale->text('Part Number'), }, |
1049 | 1049 |
'partsgroup' => { 'text' => $locale->text('Group'), }, |
... | ... | |
1052 | 1052 |
'rop' => { 'text' => $locale->text('ROP'), }, |
1053 | 1053 |
'sellprice' => { 'text' => $locale->text('Sell Price'), }, |
1054 | 1054 |
'serialnumber' => { 'text' => $locale->text('Serial Number'), }, |
1055 |
'soldtotal' => { 'text' => $locale->text('soldtotal'), },
|
|
1055 |
'soldtotal' => { 'text' => $locale->text('Qty in Selected Records'), },
|
|
1056 | 1056 |
'transdate' => { 'text' => $locale->text('Transdate'), }, |
1057 | 1057 |
'unit' => { 'text' => $locale->text('Unit'), }, |
1058 | 1058 |
'weight' => { 'text' => $locale->text('Weight'), }, |
... | ... | |
1201 | 1201 |
IC->all_parts(\%myconfig, \%$form); |
1202 | 1202 |
|
1203 | 1203 |
my @columns = qw( |
1204 |
partnumber description partsgroup bin onhand rop unit listprice |
|
1204 |
partnumber description partsgroup bin onhand rop soldtotal unit listprice
|
|
1205 | 1205 |
linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost |
1206 | 1206 |
priceupdate weight image drawing microfiche invnumber ordnumber quonumber |
1207 |
transdate name serialnumber soldtotal deliverydate ean
|
|
1207 |
transdate name serialnumber deliverydate ean |
|
1208 | 1208 |
); |
1209 | 1209 |
|
1210 | 1210 |
my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; |
locale/de/all | ||
---|---|---|
1429 | 1429 |
'Purpose' => 'Verwendungszweck', |
1430 | 1430 |
'Qty' => 'Menge', |
1431 | 1431 |
'Qty according to delivery order' => 'Menge laut Lieferschein', |
1432 |
'Qty in Selected Records' => 'Menge in gewählten Belegen', |
|
1432 | 1433 |
'Qty in stock' => 'Lagerbestand', |
1433 | 1434 |
'Quantity' => 'Menge', |
1434 | 1435 |
'Quantity missing.' => 'Die Mengenangabe fehlt.', |
... | ... | |
1653 | 1654 |
'Steuersatz' => 'Steuersatz', |
1654 | 1655 |
'Stock' => 'Einlagern', |
1655 | 1656 |
'Stock value' => 'Bestandswert', |
1657 |
'Stocked Qty' => 'Lagermenge', |
|
1656 | 1658 |
'Storno' => 'Storno', |
1657 | 1659 |
'Storno (one letter abbreviation)' => 'S', |
1658 | 1660 |
'Storno Invoice' => 'Stornorechnung', |
templates/webpages/ic/search.html | ||
---|---|---|
258 | 258 |
</td> |
259 | 259 |
<td> |
260 | 260 |
<input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y"> |
261 |
<label for="l_soldtotal">[% 'soldtotal' | $T8 %]</label>
|
|
261 |
<label for="l_soldtotal">[% 'Qty in Selected Records' | $T8 %]</label>
|
|
262 | 262 |
</td> |
263 | 263 |
<td> |
264 | 264 |
<input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y"> |
Auch abrufbar als: Unified diff
Menge und Soldtotal in Warensuche getrennt.
Fix zu Bug 1635. Ausserdem die Spalten umsortiert und die Spalten sinnvoller
benannt. Vorher wurde soldtotal im bsooqr mode auf die onhand Spalte gelegt,
das musste einfach nur entfernt werden.