From 4c6e9282cff83ba335a03e39536df3fa7b3b2101 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Wed, 20 Jul 2016 13:37:47 +0200 Subject: [PATCH] is: top100 gegrillt. standardfunktion kann das genauso. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Ich hatte das beim Umstellen auf TT damals dringelassen, weil es noch die addtop100 Funktionalität gab, mit der man sich Favoritenlisten bauen konnte. Das ist jetzt fast 9 Jahre her, und die Funktion ist seit dem kaputt. Weg damit. Wenn gewünscht kann das beim merge von OD wieder berücksichtigt werden. --- bin/mozilla/ic.pl | 782 +--------------------------------------------- 1 file changed, 16 insertions(+), 766 deletions(-) diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 6218c8e8e..140ed9349 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -197,781 +197,31 @@ sub update_prices { $lxdebug->leave_sub(); } -#sub choice { -# $lxdebug->enter_sub(); -# -# $auth->assert('part_service_assembly_edit'); -# -# our ($j, $lastndx); -# my ($totop100); -# -# $form->{title} = $locale->text('Top 100 hinzufuegen'); -# -# $form->header; -# -# push @custom_hiddens, qw(searchitems title bom titel revers lastsort sort ndxs_counter extras); -# push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice); -# my @HIDDENS = ( -# +{ name => 'row', value => $j }, -# +{ name => 'nextsub', value => 'item_selected' }, -# +{ name => 'test', value => 'item_selected' }, -# +{ name => 'lastndx', value => $lastndx }, -# map(+{ name => $_, value => $form->{$_} }, @custom_hiddens), -# ); -# -# my ($partnumber, $description, $unit, $sellprice, $soldtotal); -# # if choice set data -## if ($form->{ndx}) { -## for my $i (0 .. $form->{ndxs_counter}) { -## -## # insert data into top100 -## push @{ $form->{parts} }, -## { number => "", -## partnumber => $form->{"totop100_partnumber_$j"}, -## description => $form->{"totop100_description_$j"}, -## unit => $form->{"totop100_unit_$j"}, -## sellprice => $form->{"totop100_sellprice_$j"}, -## soldtotal => $form->{"totop100_soldtotal_$j"}, -## }; -## } #rof -## } #fi -# -# $totop100 = ""; -# -# # set data for next page -# for my $i (1 .. $form->{ndxs_counter}) { -# $partnumber = $form->{"totop100_partnumber_$i"}; -# $description = $form->{"totop100_description_$i"}; -# $unit = $form->{"totop100_unit_$i"}; -# $sellprice = $form->{"totop100_sellprice_$i"}; -# $soldtotal = $form->{"totop100_soldtotal_$i"}; -# -# push @PARTS, { -# totop100_partnumber => $form->{"totop100_partnumber_$i"}, -# totop100_description => $form->{"totop100_description_$i"}, -# totop100_unit => $form->{"totop100_unit_$i"}, -# totop100_sellprice => $form->{"totop100_sellprice_$i"}, -# totop100_soldtotal => $form->{"totop100_soldtotal_$i"}, -# } -# -## $totop100 .= qq| -##{"totop100_partnumber_$i"}> -##{"totop100_description_$i"}> -##{"totop100_unit_$i"}> -##{"totop100_sellprice_$i"}> -##{"totop100_soldtotal_$i"}> -## |; -# } #rof -# -# print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, PARTS => \@PARTS }); -# -# $lxdebug->leave_sub(); -#} #end choice - -#sub list { -# $lxdebug->enter_sub(); -# -# $auth->assert('part_service_assembly_edit'); -# -# our ($lastndx); -# our ($partnumber, $description, $unit, $sellprice, $soldtotal); -# -# my @sortorders = ("", "partnumber", "description", "all"); -# my $sortorder = $sortorders[($form->{description} ? 2 : 0) + ($form->{partnumber} ? 1 : 0)]; -# IC->get_parts(\%myconfig, \%$form, $sortorder); -# -# $form->{title} = $locale->text('Top 100 hinzufuegen'); -# -# $form->header; -# -# print qq| -#

| . $locale->text('choice part') . qq|

-#
-# -# -# -# -# -# -# -# -# |; -# -# my $j = 0; -# my $i = $form->{rows}; -# -# for ($j = 1; $j <= $i; $j++) { -# -# print qq| -# |; -# if ($j == 1) { -# print qq| -# |; -# } else { -# print qq| -# |; -# } -# print qq| -# -# -# -# -# -# -# -# |; -# } -# -# print qq| -# -#
 | . $locale->text('Part Number') . qq|| . $locale->text('Part Description') . qq|| . $locale->text('Unit of measure') . qq|| . $locale->text('Sell Price') . qq|| . $locale->text('soldtotal') . qq|
$form->{"partnumber_$j"}$form->{"description_$j"}$form->{"unit_$j"}$form->{"sellprice_$j"}$form->{"soldtotal_$j"}
-# -#
-# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -#{ndxs_counter}>|; -# -# my $totop100 = ""; -# -# if (($form->{ndxs_counter}) > 0) { -# for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) { -# -# $partnumber = $form->{"totop100_partnumber_$i"}; -# $description = $form->{"totop100_description_$i"}; -# $unit = $form->{"totop100_unit_$i"}; -# $sellprice = $form->{"totop100_sellprice_$i"}; -# $soldtotal = $form->{"totop100_soldtotal_$i"}; -# -# $totop100 .= qq| -#{"totop100_partnumber_$i"}> -#{"totop100_description_$i"}> -#{"totop100_unit_$i"}> -#{"totop100_sellprice_$i"}> -#{"totop100_soldtotal_$i"}> -# |; -# } #rof -# } #fi -# -# print $totop100; -# -# print qq| -# -# -#
-#|; -# $lxdebug->leave_sub(); -#} #end list() - sub top100 { - $lxdebug->enter_sub(); - - $auth->assert('part_service_assembly_edit'); - - if ($form->{ndx}) { - $form->{ndxs_counter}++; - - if ($form->{ndxs_counter} > 0) { - - my $index = $form->{ndx}; - - $form->{"totop100_partnumber_$form->{ndxs_counter}"} = $form->{"new_partnumber_$index"}; - $form->{"totop100_description_$form->{ndxs_counter}"} = $form->{"new_description_$index"}; - $form->{"totop100_unit_$form->{ndxs_counter}"} = $form->{"new_unit_$index"}; - $form->{"totop100_sellprice_$form->{ndxs_counter}"} = $form->{"new_sellprice_$index"}; - $form->{"totop100_soldtotal_$form->{ndxs_counter}"} = $form->{"new_soldtotal_$index"}; - } #fi - } #fi - &addtop100(); - $lxdebug->leave_sub(); -} #end top100 - -sub addtop100 { - $lxdebug->enter_sub(); - - $auth->assert('part_service_assembly_edit'); - - my ($revers, $lastsort, $callback, $option, $description, $sameitem, - $partnumber, $unit, $sellprice, $soldtotal, $totop100, $onhand, $align); - my (@column_index, %column_header, %column_data); - my ($totalsellprice, $totallastcost, $totallistprice, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice); - - $form->{top100} = "top100"; - $form->{l_soldtotal} = "Y"; - $form->{soldtotal} = "soldtotal"; - $form->{sort} = "soldtotal"; - $form->{l_qty} = "N"; - $form->{l_linetotal} = ""; - $form->{revers} = 1; - $form->{number} = "position"; - $form->{l_number} = "Y"; - - $totop100 = ""; - - $form->{title} = $locale->text('Top 100'); - - $revers = $form->{revers}; - $lastsort = $form->{lastsort}; - - if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) { - $form->{revers} = 0; - $form->{lastsort} = "partnumber"; - $form->{sort} = "partnumber"; - } #fi - - $callback = - "$form->{script}?action=top100&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" - . $form->escape($form->{title}, 1); - - # if we have a serialnumber limit search - if ($form->{serialnumber} || $form->{l_serialnumber}) { - $form->{l_serialnumber} = "Y"; - unless ( $form->{bought} - || $form->{sold} - || $form->{rfq} - || $form->{quoted}) { - $form->{bought} = $form->{sold} = 1; - } - } - IC->all_parts(\%myconfig, \%$form); - - if ($form->{itemstatus} eq 'active') { - $option .= $locale->text('Active') . " : "; - } - if ($form->{itemstatus} eq 'obsolete') { - $option .= $locale->text('Obsolete') . " : "; - } - if ($form->{itemstatus} eq 'orphaned') { - $option .= $locale->text('Orphaned') . " : "; - } - if ($form->{itemstatus} eq 'onhand') { - $option .= $locale->text('On Hand') . " : "; - $form->{l_onhand} = "Y"; - } - if ($form->{itemstatus} eq 'short') { - $option .= $locale->text('Short') . " : "; - $form->{l_onhand} = "Y"; - } - if ($form->{onorder}) { - $form->{l_ordnumber} = "Y"; - $callback .= "&onorder=$form->{onorder}"; - $option .= $locale->text('On Order') . " : "; - } - if ($form->{ordered}) { - $form->{l_ordnumber} = "Y"; - $callback .= "&ordered=$form->{ordered}"; - $option .= $locale->text('Ordered') . " : "; - } - if ($form->{rfq}) { - $form->{l_quonumber} = "Y"; - $callback .= "&rfq=$form->{rfq}"; - $option .= $locale->text('RFQ') . " : "; - } - if ($form->{quoted}) { - $form->{l_quonumber} = "Y"; - $callback .= ""ed=$form->{quoted}"; - $option .= $locale->text('Quoted') . " : "; - } - if ($form->{bought}) { - $form->{l_invnumber} = "Y"; - $callback .= "&bought=$form->{bought}"; - $option .= $locale->text('Bought') . " : "; - } - if ($form->{sold}) { - $form->{l_invnumber} = "Y"; - $callback .= "&sold=$form->{sold}"; - $option .= $locale->text('Sold') . " : "; - } - if ( $form->{bought} - || $form->{sold} - || $form->{onorder} - || $form->{ordered} - || $form->{rfq} - || $form->{quoted}) { - - $form->{l_lastcost} = ""; - $form->{l_name} = "Y"; - if ($form->{transdatefrom}) { - $callback .= "&transdatefrom=$form->{transdatefrom}"; - $option .= "\n
" - . $locale->text('From') - . " " - . $locale->date(\%myconfig, $form->{transdatefrom}, 1); - } - if ($form->{transdateto}) { - $callback .= "&transdateto=$form->{transdateto}"; - $option .= "\n
" - . $locale->text('To') - . " " - . $locale->date(\%myconfig, $form->{transdateto}, 1); - } - } - - $option .= "
"; - - if ($form->{partnumber}) { - $callback .= "&partnumber=$form->{partnumber}"; - $option .= $locale->text('Part Number') . qq| : $form->{partnumber}
|; - } - if ($form->{ean}) { - $callback .= "&partnumber=$form->{ean}"; - $option .= $locale->text('EAN') . qq| : $form->{ean}
|; - } - if ($form->{partsgroup}) { - $callback .= "&partsgroup=$form->{partsgroup}"; - $option .= $locale->text('Group') . qq| : $form->{partsgroup}
|; - } - if ($form->{serialnumber}) { - $callback .= "&serialnumber=$form->{serialnumber}"; - $option .= $locale->text('Serial Number') . qq| : $form->{serialnumber}
|; - } - if ($form->{description}) { - $callback .= "&description=$form->{description}"; - $description = $form->{description}; - $description =~ s/\n/
/g; - $option .= $locale->text('Part Description') . qq| : $form->{description}
|; - } - if ($form->{make}) { - $callback .= "&make=$form->{make}"; - $option .= $locale->text('Make') . qq| : $form->{make}
|; - } - if ($form->{model}) { - $callback .= "&model=$form->{model}"; - $option .= $locale->text('Model') . qq| : $form->{model}
|; - } - if ($form->{drawing}) { - $callback .= "&drawing=$form->{drawing}"; - $option .= $locale->text('Drawing') . qq| : $form->{drawing}
|; - } - if ($form->{microfiche}) { - $callback .= "µfiche=$form->{microfiche}"; - $option .= $locale->text('Microfiche') . qq| : $form->{microfiche}
|; - } - if ($form->{l_soldtotal}) { - $callback .= "&soldtotal=$form->{soldtotal}"; - $option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|; - } - - my @columns = $form->sort_columns( - qw(number partnumber ean description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal) - ); - - if ($form->{l_linetotal}) { - $form->{l_onhand} = "Y"; - $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice}; - if ($form->{l_lastcost}) { - $form->{l_linetotallastcost} = "Y"; - if (($form->{searchitems} eq 'assembly') && !$form->{bom}) { - $form->{l_linetotallastcost} = ""; - } - } - $form->{l_linetotallistprice} = "Y" if $form->{l_listprice}; - } - - if ($form->{searchitems} eq 'service') { - - # remove bin, weight and rop from list - map { $form->{"l_$_"} = "" } qw(bin weight rop); - - $form->{l_onhand} = ""; + $::lxdebug->enter_sub(); - # qty is irrelevant unless bought or sold - if ( $form->{bought} - || $form->{sold} - || $form->{onorder} - || $form->{ordered} - || $form->{rfq} - || $form->{quoted}) { - $form->{l_onhand} = "Y"; - } else { - $form->{l_linetotalsellprice} = ""; - $form->{l_linetotallastcost} = ""; - } - } + $::auth->assert('part_service_assembly_edit'); - foreach my $item (@columns) { - if ($form->{"l_$item"} eq "Y") { - push @column_index, $item; + $::form->{l_soldtotal} = "Y"; + $::form->{sort} = "soldtotal"; + $::form->{lastsort} = "soldtotal"; - # add column to callback - $callback .= "&l_$item=Y"; - } - } + $::form->{l_qty} = undef; + $::form->{l_linetotal} = undef; + $::form->{l_number} = "Y"; + $::form->{number} = "position"; - if ($form->{l_subtotal} eq 'Y') { - $callback .= "&l_subtotal=Y"; + unless ( $::form->{bought} + || $::form->{sold} + || $::form->{rfq} + || $::form->{quoted}) { + $::form->{bought} = $::form->{sold} = 1; } - $column_header{number} = - qq|| . $locale->text('number') . qq||; - $column_header{partnumber} = - qq|{revers}&lastsort=$form->{lastsort}>| - . $locale->text('Part Number') - . qq||; - $column_header{description} = - qq|{revers}&lastsort=$form->{lastsort}>| - . $locale->text('Part Description') - . qq||; - $column_header{partsgroup} = - qq|| - . $locale->text('Group') - . qq||; - $column_header{bin} = - qq|| - . $locale->text('Bin') - . qq||; - $column_header{priceupdate} = - qq|| - . $locale->text('Updated') - . qq||; - $column_header{onhand} = - qq|{revers}&lastsort=$form->{lastsort}>| - . $locale->text('Qty') - . qq||; - $column_header{unit} = - qq|| . $locale->text('Unit') . qq||; - $column_header{listprice} = - qq|| - . $locale->text('List Price') - . qq||; - $column_header{lastcost} = - qq|| . $locale->text('Last Cost') . qq||; - $column_header{rop} = - qq|| . $locale->text('ROP') . qq||; - $column_header{weight} = - qq|| . $locale->text('Weight') . qq||; - - $column_header{invnumber} = - qq|| - . $locale->text('Invoice Number') - . qq||; - $column_header{ordnumber} = - qq|| - . $locale->text('Order Number') - . qq||; - $column_header{quonumber} = - qq|| - . $locale->text('Quotation') - . qq||; - - $column_header{name} = - qq|| - . $locale->text('Name') - . qq||; - - $column_header{sellprice} = - qq|| - . $locale->text('Sell Price') - . qq||; - $column_header{linetotalsellprice} = - qq|| . $locale->text('Extended') . qq||; - $column_header{linetotallastcost} = - qq|| . $locale->text('Extended') . qq||; - $column_header{linetotallistprice} = - qq|| . $locale->text('Extended') . qq||; - - $column_header{image} = - qq|| . $locale->text('Image') . qq||; - $column_header{drawing} = - qq|| - . $locale->text('Drawing') - . qq||; - $column_header{microfiche} = - qq|| - . $locale->text('Microfiche') - . qq||; - - $column_header{serialnumber} = - qq|| - . $locale->text('Serial Number') - . qq||; - $column_header{soldtotal} = - qq|{revers}&lastsort=$form->{lastsort}>| - . $locale->text('soldtotal') - . qq||; - - $form->header; - my $colspan = $#column_index + 1; - - print qq| -

$form->{title}

- - - - - - -|; - - map { print "\n$column_header{$_}" } @column_index; - - print qq| - - |; - - # add order to callback - $form->{callback} = $callback .= "&sort=$form->{sort}"; - - # escape callback for href - $callback = $form->escape($callback); - - if (@{ $form->{parts} }) { - $sameitem = $form->{parts}->[0]->{ $form->{sort} }; - } - - # insert numbers for top100 - my $j = 0; - foreach my $ref (@{ $form->{parts} }) { - $j++; - $ref->{number} = $j; - } - - # if avaible -> insert choice here - if (($form->{ndxs_counter}) > 0) { - for (my $i = 1; ($i < $form->{ndxs_counter} + 1); $i++) { - $partnumber = $form->{"totop100_partnumber_$i"}; - $description = $form->{"totop100_description_$i"}; - $unit = $form->{"totop100_unit_$i"}; - $sellprice = $form->{"totop100_sellprice_$i"}; - $soldtotal = $form->{"totop100_soldtotal_$i"}; - - $totop100 .= qq| -{"totop100_partnumber_$i"}> -{"totop100_description_$i"}> -{"totop100_unit_$i"}> -{"totop100_sellprice_$i"}> -{"totop100_soldtotal_$i"}> - |; - - # insert into list - push @{ $form->{parts} }, - { number => "", - partnumber => "$partnumber", - description => "$description", - unit => "$unit", - sellprice => "$sellprice", - soldtotal => "$soldtotal" }; - } #rof - } #fi - # build data for columns - my $i = 0; - foreach my $ref (@{ $form->{parts} }) { - - if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { - if ($sameitem ne $ref->{ $form->{sort} }) { - parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); - $sameitem = $ref->{ $form->{sort} }; - } - } - - $ref->{exchangerate} = 1 unless $ref->{exchangerate}; - $ref->{sellprice} *= $ref->{exchangerate}; - $ref->{listprice} *= $ref->{exchangerate}; - $ref->{lastcost} *= $ref->{exchangerate}; - - # use this for assemblies - $onhand = $ref->{onhand}; - - $align = "left"; - if ($ref->{assemblyitem}) { - $align = "right"; - $onhand = 0 if ($form->{sold}); - } - - $ref->{description} =~ s/\n/
/g; - - $column_data{number} = - ""; - $column_data{partnumber} = - ""; - $column_data{description} = ""; - $column_data{partsgroup} = ""; - - $column_data{onhand} = - ""; - $column_data{sellprice} = - ""; - $column_data{listprice} = - ""; - $column_data{lastcost} = - ""; - - $column_data{linetotalsellprice} = ""; - $column_data{linetotallastcost} = ""; - $column_data{linetotallistprice} = ""; - - if (!$ref->{assemblyitem}) { - $totalsellprice += $onhand * $ref->{sellprice}; - $totallastcost += $onhand * $ref->{lastcost}; - $totallistprice += $onhand * $ref->{listprice}; - - $subtotalonhand += $onhand; - $subtotalsellprice += $onhand * $ref->{sellprice}; - $subtotallastcost += $onhand * $ref->{lastcost}; - $subtotallistprice += $onhand * $ref->{listprice}; - } - - $column_data{rop} = - ""; - $column_data{weight} = - ""; - $column_data{unit} = ""; - $column_data{bin} = ""; - $column_data{priceupdate} = ""; - - $column_data{invnumber} = - ($ref->{module} ne 'oe') - ? "" - : ""; - $column_data{ordnumber} = - ($ref->{module} eq 'oe') - ? "" - : ""; - $column_data{quonumber} = - ($ref->{module} eq 'oe' && !$ref->{ordnumber}) - ? "" - : ""; - - $column_data{name} = ""; - - $column_data{image} = - ($ref->{image}) - ? "" - : ""; - $column_data{drawing} = - ($ref->{drawing}) - ? "" - : ""; - $column_data{microfiche} = - ($ref->{microfiche}) - ? "" - : ""; - - $column_data{serialnumber} = ""; - - $column_data{soldtotal} = ""; - - $i++; - $i %= 2; - print ""; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - } - - if ($form->{l_subtotal} eq 'Y') { - parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); - } #fi - - if ($form->{"l_linetotal"}) { - map { $column_data{$_} = "" } @column_index; - $column_data{linetotalsellprice} = - ""; - $column_data{linetotallastcost} = - ""; - $column_data{linetotallistprice} = - ""; - - print ""; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - |; - } - - print qq| - -
$option
" - . $form->format_amount(\%myconfig, $ref->{number}) - . "$ref->{partnumber} $ref->{description} $ref->{partsgroup} " - . $form->format_amount(\%myconfig, $ref->{onhand}) - . "" - . $form->format_amount(\%myconfig, $ref->{sellprice}) - . "" - . $form->format_amount(\%myconfig, $ref->{listprice}) - . "" - . $form->format_amount(\%myconfig, $ref->{lastcost}) - . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2) - . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2) - . "" - . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2) - . "" - . $form->format_amount(\%myconfig, $ref->{rop}) . "" - . $form->format_amount(\%myconfig, $ref->{weight}) - . "$ref->{unit} $ref->{bin} $ref->{priceupdate} {module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&callback=$callback>$ref->{invnumber}$ref->{invnumber}{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{ordnumber}$ref->{ordnumber}{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{quonumber}$ref->{quonumber}$ref->{name}{image}>{image} height=32 border=0> {drawing}>$ref->{drawing} {microfiche}>$ref->{microfiche} $ref->{serialnumber}$ref->{soldtotal}
 " - . $form->format_amount(\%myconfig, $totalsellprice, 2) - . "" - . $form->format_amount(\%myconfig, $totallastcost, 2) - . "" - . $form->format_amount(\%myconfig, $totallistprice, 2) - . "

- -|; - - print qq| - -
- -
{script}> - - - - - - - - - - - - - - - - -|; - - print $totop100; - - print qq| - - - - -
-|; + generate_report(); $lxdebug->leave_sub(); -} # end addtop100 +} # # Report for Wares. -- 2.20.1