X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=0e7fdf533149cf957f77d1017a8f158cd9273ad0;hb=c09c9c4ce0afe48535f3ae369d7e3769e0a1245c;hp=3df2e51ed60d680415ea750787642b39997b9196;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 3df2e51ed..0e7fdf533 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -31,12 +31,13 @@ # #====================================================================== - use SL::IC; +#use SL::PE; require "$form->{path}/io.pl"; 1; + # end of main sub add { @@ -44,10 +45,13 @@ sub add { $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); - $form->{callback} = "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; - - $form->{unit} = ($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea'); + $form->{callback} = + "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + unless $form->{callback}; + $form->{unit} = + ($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea'); + IC->get_pricegroups(\%myconfig, \%$form); &link_part; &display_form; @@ -57,68 +61,77 @@ sub add { sub search { $lxdebug->enter_sub(); - $form->{title} = (ucfirst $form->{searchitems})."s"; + $form->{title} = (ucfirst $form->{searchitems}) . "s"; $form->{title} = $locale->text($form->{title}); # switch for backward sorting $form->{revers} = 0; + # memory for which table was sort at last time $form->{lastsort} = ""; + # counter for added entries to top100 $form->{ndxs_counter} = 0; -# $locale->text('Parts') -# $locale->text('Services') + # $locale->text('Parts') + # $locale->text('Services') # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; - $jsscript = ""; - if ($form->{jsscript}) - { + $jsscript = ""; + if ($form->{jsscript}) { + # with JavaScript Calendar $button1 = qq| - text('button').qq|> + text('button') . qq|> |; - $button2 = qq| + $button2 = qq| - text('button').qq|> + text('button') . qq|> |; + #write Trigger - $jsscript = Form->write_trigger(\%myconfig,"2","transdatefrom","BL","trigger1","transdateto","BL","trigger2"); - } - else - { - # without JavaScript Calendar - $button1 = qq| + $jsscript = + Form->write_trigger(\%myconfig, "2", "transdatefrom", "BL", "trigger1", + "transdateto", "BL", "trigger2"); + } else { + + # without JavaScript Calendar + $button1 = qq| |; - $button2 = qq| + $button2 = qq| |; - } + } unless ($form->{searchitems} eq 'service') { $onhand = qq| -  |.$locale->text('On Hand').qq| -  |.$locale->text('Short').qq| +  | + . $locale->text('On Hand') . qq| +  | + . $locale->text('Short') . qq| |; $makemodel = qq| - |.$locale->text('Make').qq| + | . $locale->text('Make') . qq| - |.$locale->text('Model').qq| + | . $locale->text('Model') . qq| |; $serialnumber = qq| - |.$locale->text('Serial Number').qq| + | . $locale->text('Serial Number') . qq| |; $l_serialnumber = qq| -  |.$locale->text('Serial Number').qq| +  | + . $locale->text('Serial Number') . qq| |; } @@ -131,8 +144,10 @@ sub search { -  |.$locale->text('Top Level').qq| -  |.$locale->text('Individual Items').qq| +  | + . $locale->text('Top Level') . qq| +  | + . $locale->text('Individual Items') . qq| |; @@ -147,28 +162,28 @@ sub search { - + - + - +
|.$locale->text('Sold').qq|| . $locale->text('Sold') . qq|

|.$locale->text('Ordered').qq|| . $locale->text('Ordered') . qq|

|.$locale->text('Quoted').qq|| . $locale->text('Quoted') . qq|
  - |.$locale->text('From').qq| + | . $locale->text('From') . qq| $button1 - |.$locale->text('To').qq| + | . $locale->text('To') . qq| $button2 @@ -178,7 +193,7 @@ sub search { } else { - $bought = qq| + $bought = qq| @@ -188,27 +203,27 @@ sub search { - + - + - + - + - + - +
|.$locale->text('Bought').qq|| . $locale->text('Bought') . qq| |.$locale->text('Sold').qq|| . $locale->text('Sold') . qq|

|.$locale->text('On Order').qq|| . $locale->text('On Order') . qq| |.$locale->text('Ordered').qq|| . $locale->text('Ordered') . qq|

|.$locale->text('RFQ').qq|| . $locale->text('RFQ') . qq| |.$locale->text('Quoted').qq|| . $locale->text('Quoted') . qq|
@@ -216,9 +231,9 @@ sub search { - + $button1 - + $button2
|.$locale->text('From').qq|| . $locale->text('From') . qq||.$locale->text('To').qq|| . $locale->text('To') . qq|
@@ -250,33 +265,37 @@ sub search { - + - + - + $serialnumber $makemodel - + - + $toplevel $bought @@ -287,36 +306,54 @@ sub search { - + @@ -341,25 +378,26 @@ $jsscript
- - + + |; $lxdebug->leave_sub(); -}#end search() - +} #end search() sub choice { $lxdebug->enter_sub(); $form->{title} = $locale->text('Top 100 hinzufuegen'); - - $form->header; - -print qq| + + $form->header; + + print qq| {script}> @@ -370,12 +408,13 @@ print qq| |; - -print qq| + print qq|
|.$locale->text('Part Number').qq|| . $locale->text('Part Number') . qq|
|.$locale->text('Part Description').qq|| + . $locale->text('Part Description') . qq|
|.$locale->text('Group').qq|| . $locale->text('Group') . qq|
|.$locale->text('Drawing').qq|| . $locale->text('Drawing') . qq| |.$locale->text('Microfiche').qq|| . $locale->text('Microfiche') . qq|
-  |.$locale->text('Active').qq| +  | + . $locale->text('Active') . qq| $onhand -  |.$locale->text('Obsolete').qq| -  |.$locale->text('Orphaned').qq| +  | + . $locale->text('Obsolete') . qq| +  | + . $locale->text('Orphaned') . qq|
|.$locale->text('Include in Report').qq|| + . $locale->text('Include in Report') . qq| - - + + $l_serialnumber - + - - - - + + + + - - - - + + + + - - - - + + + + - - + +
 |.$locale->text('Part Number').qq| |.$locale->text('Part Description').qq| | + . $locale->text('Part Number') . qq| | + . $locale->text('Part Description') . qq| |.$locale->text('Unit of measure').qq| | + . $locale->text('Unit of measure') . qq|
 |.$locale->text('List Price').qq| |.$locale->text('Sell Price').qq| |.$locale->text('Last Cost').qq| |.$locale->text('Line Total').qq| | + . $locale->text('List Price') . qq| | + . $locale->text('Sell Price') . qq| | + . $locale->text('Last Cost') . qq| | + . $locale->text('Line Total') . qq|
 |.$locale->text('Updated').qq| |.$locale->text('Bin').qq| |.$locale->text('ROP').qq| |.$locale->text('Weight').qq| | + . $locale->text('Updated') . qq| | + . $locale->text('Bin') . qq| | + . $locale->text('ROP') . qq| | + . $locale->text('Weight') . qq|
 |.$locale->text('Image').qq| |.$locale->text('Drawing').qq| |.$locale->text('Microfiche').qq| |.$locale->text('Group').qq| | + . $locale->text('Image') . qq| | + . $locale->text('Drawing') . qq| | + . $locale->text('Microfiche') . qq| | + . $locale->text('Group') . qq|
 |.$locale->text('Subtotal').qq| |.$locale->text('soldtotal').qq| | + . $locale->text('Subtotal') . qq| | + . $locale->text('soldtotal') . qq|
- - + + @@ -383,8 +422,8 @@ print qq|
|.$locale->text('Part Number').qq||.$locale->text('Part Description').qq|| + . $locale->text('Part Number') . qq|| + . $locale->text('Part Description') . qq|

|; - -print qq| + + print qq| {path}> {login}> @@ -418,36 +457,39 @@ print qq| {extras}>|; -# if choice set data -if ($form->{ndx}) - { - for($i=0;$i<$form->{ndxs_counter};$i++) - { - # prepeare data - $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"}; + # if choice set data + if ($form->{ndx}) { + for ($i = 0; $i < $form->{ndxs_counter}; $i++) { + + # prepeare data + $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"}; # insert data into top100 - push @{$form->{parts}},{number => "",partnumber => "$partnumber",description => "$description",unit => "$unit",sellprice => "$sellprice", soldtotal => "$soldtotal"}; - }#rof - }#fi + push @{ $form->{parts} }, + { number => "", + partnumber => "$partnumber", + description => "$description", + unit => "$unit", + sellprice => "$sellprice", + soldtotal => "$soldtotal" }; + } #rof + } #fi $totop100 = ""; # set data for next page - 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"}; - + 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"}> @@ -455,86 +497,75 @@ if ($form->{ndx}) {"totop100_sellprice_$i"}> {"totop100_soldtotal_$i"}> |; - }#rof - }#fi + } #rof + } #fi -print $totop100; + print $totop100; -print qq| - + print qq| + |; $lxdebug->leave_sub(); -}#end choice - - +} #end choice sub list { $lxdebug->enter_sub(); - # get parts for - if (($form->{partnumber} eq "") and ($form->{description} eq "")) - { - IC->get_parts(\%myconfig, \%$form, ""); - } - else - { - if ((!($form->{partnumber} eq "")) and ($form->{description} eq "")) - { - IC->get_parts(\%myconfig, \%$form, "partnumber"); - } - else - { - if (($form->{partnumber} eq "") and (!($form->{description} eq ""))) - { - IC->get_parts(\%myconfig, \%$form, "description"); - } - else - { + # get parts for + if (($form->{partnumber} eq "") and ($form->{description} eq "")) { + IC->get_parts(\%myconfig, \%$form, ""); + } else { + if ((!($form->{partnumber} eq "")) and ($form->{description} eq "")) { + IC->get_parts(\%myconfig, \%$form, "partnumber"); + } else { + if (($form->{partnumber} eq "") and (!($form->{description} eq ""))) { + IC->get_parts(\%myconfig, \%$form, "description"); + } else { IC->get_parts(\%myconfig, \%$form, "all"); - }#fi - }#fi - }#fi - + } #fi + } #fi + } #fi + $form->{title} = $locale->text('Top 100 hinzufuegen'); - + $form->header; -print qq| + print qq|
- + - - - - - + + + + + |; - - my $j=0; - my $i=$form->{rows}; - for ($j=1; $j<=$i; $j++){ + my $j = 0; + my $i = $form->{rows}; + + for ($j = 1; $j <= $i; $j++) { print qq| |; - if ($j==1) { - print qq| + if ($j == 1) { + print qq| |; - } - else { - print qq| + } else { + print qq| |; - } - print qq| + } + print qq| @@ -545,7 +576,7 @@ print qq| |; } -print qq| + print qq|
|.$locale->text('choice part').qq|| . $locale->text('choice part') . 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|| . $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"}
@@ -580,24 +611,21 @@ print qq| {ndxs_counter}>|; + $totop100 = ""; + + if (($form->{ndxs_counter}) > 0) { + for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) { + $j1 = $form->{"totop100_partnumber_$i"}; + $j2 = $form->{"totop100_description_$i"}; + $j3 = $form->{"totop100_unit_$i"}; + $j4 = $form->{"totop100_sellprice_$i"}; + $j5 = $form->{"totop100_soldtotal_$i"}; -$totop100 = ""; - -if (($form->{ndxs_counter})>0) - { - for($i=1;($i<$form->{ndxs_counter}+1);$i++) - { - $j1=$form->{"totop100_partnumber_$i"}; - $j2=$form->{"totop100_description_$i"}; - $j3=$form->{"totop100_unit_$i"}; - $j4=$form->{"totop100_sellprice_$i"}; - $j5=$form->{"totop100_soldtotal_$i"}; - - $partnumber=$j1; - $description=$j2; - $unit=$j3; - $sellprice=$j4; - $soldtotal=$j5; + $partnumber = $j1; + $description = $j2; + $unit = $j3; + $sellprice = $j4; + $soldtotal = $j5; $totop100 .= qq| {"totop100_partnumber_$i"}> @@ -606,34 +634,34 @@ if (($form->{ndxs_counter})>0) {"totop100_sellprice_$i"}> {"totop100_soldtotal_$i"}> |; - }#rof - }#fi + } #rof + } #fi -print $totop100; + print $totop100; -print qq| - + print qq| +
|; $lxdebug->leave_sub(); -}#end list() - +} #end list() sub top100 { $lxdebug->enter_sub(); - if ($form->{ndx}){ + if ($form->{ndx}) { $form->{ndxs_counter}++; - - if ($form->{ndxs_counter}>0){ + + if ($form->{ndxs_counter} > 0) { $index = $form->{ndx}; - + $j1 = $form->{"new_partnumber_$index"}; - $form->{"totop100_partnumber_$form->{ndxs_counter}"} =$j1; + $form->{"totop100_partnumber_$form->{ndxs_counter}"} = $j1; $j2 = $form->{"new_description_$index"}; $form->{"totop100_description_$form->{ndxs_counter}"} = $j2; $j3 = $form->{"new_unit_$index"}; @@ -641,111 +669,125 @@ sub top100 { $j4 = $form->{"new_sellprice_$index"}; $form->{"totop100_sellprice_$form->{ndxs_counter}"} = $j4; $j5 = $form->{"new_soldtotal_$index"}; - $form->{"totop100_soldtotal_$form->{ndxs_counter}"} = $j5; - }#fi - }#fi + $form->{"totop100_soldtotal_$form->{ndxs_counter}"} = $j5; + } #fi + } #fi &addtop100(); $lxdebug->leave_sub(); -}#end top100 - +} #end top100 sub addtop100 { $lxdebug->enter_sub(); - $form->{top100} = "top100"; + $form->{top100} = "top100"; $form->{l_soldtotal} = "Y"; - $form->{soldtotal} = "soldtotal"; - $form->{sort} = "soldtotal"; - $form->{l_qty} = "N"; + $form->{soldtotal} = "soldtotal"; + $form->{sort} = "soldtotal"; + $form->{l_qty} = "N"; $callback .= "&form->{top100}=$form->{top100}"; $form->{l_linetotal} = ""; - $form->{revers} = 1; - $form->{number} = "position"; - $form->{l_number} = "Y"; - + $form->{revers} = 1; + $form->{number} = "position"; + $form->{l_number} = "Y"; + my $totop100 = ""; $form->{title} = $locale->text('Top 100'); - - $revers = $form->{revers}; + + $revers = $form->{revers}; $lastsort = $form->{lastsort}; - if (($form->{lastsort} eq "")&&($form->{sort} eq undef)) - { - $form->{revers} = 0; - $form->{lastsort} = "partnumber"; - $form->{sort} = "partnumber"; - }#fi + if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) { + $form->{revers} = 0; + $form->{lastsort} = "partnumber"; + $form->{sort} = "partnumber"; + } #fi - $callback = "$form->{script}?action=top100&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=".$form->escape($form->{title},1); + $callback = + "$form->{script}?action=top100&path=$form->{path}&login=$form->{login}&password=$form->{password}&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}) { + 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')." : "; + $option .= $locale->text('Active') . " : "; } if ($form->{itemstatus} eq 'obsolete') { - $option .= $locale->text('Obsolete')." : "; + $option .= $locale->text('Obsolete') . " : "; } if ($form->{itemstatus} eq 'orphaned') { - $option .= $locale->text('Orphaned')." : "; + $option .= $locale->text('Orphaned') . " : "; } if ($form->{itemstatus} eq 'onhand') { - $option .= $locale->text('On Hand')." : "; + $option .= $locale->text('On Hand') . " : "; $form->{l_onhand} = "Y"; } if ($form->{itemstatus} eq 'short') { - $option .= $locale->text('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')." : "; + $option .= $locale->text('On Order') . " : "; } if ($form->{ordered}) { $form->{l_ordnumber} = "Y"; $callback .= "&ordered=$form->{ordered}"; - $option .= $locale->text('Ordered')." : "; + $option .= $locale->text('Ordered') . " : "; } if ($form->{rfq}) { $form->{l_quonumber} = "Y"; $callback .= "&rfq=$form->{rfq}"; - $option .= $locale->text('RFQ')." : "; + $option .= $locale->text('RFQ') . " : "; } if ($form->{quoted}) { $form->{l_quonumber} = "Y"; $callback .= ""ed=$form->{quoted}"; - $option .= $locale->text('Quoted')." : "; + $option .= $locale->text('Quoted') . " : "; } if ($form->{bought}) { $form->{l_invnumber} = "Y"; $callback .= "&bought=$form->{bought}"; - $option .= $locale->text('Bought')." : "; + $option .= $locale->text('Bought') . " : "; } if ($form->{sold}) { $form->{l_invnumber} = "Y"; $callback .= "&sold=$form->{sold}"; - $option .= $locale->text('Sold')." : "; + $option .= $locale->text('Sold') . " : "; } - if ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered} || $form->{rfq} || $form->{quoted}) { + if ( $form->{bought} + || $form->{sold} + || $form->{onorder} + || $form->{ordered} + || $form->{rfq} + || $form->{quoted}) { $form->{l_lastcost} = ""; - $form->{l_name} = "Y"; + $form->{l_name} = "Y"; if ($form->{transdatefrom}) { $callback .= "&transdatefrom=$form->{transdatefrom}"; - $option .= "\n
".$locale->text('From')." ".$locale->date(\%myconfig, $form->{transdatefrom}, 1); + $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 .= "\n
" + . $locale->text('To') + . " " + . $locale->date(\%myconfig, $form->{transdateto}, 1); } } @@ -753,46 +795,49 @@ sub addtop100 { if ($form->{partnumber}) { $callback .= "&partnumber=$form->{partnumber}"; - $option .= $locale->text('Part Number').qq| : $form->{partnumber}
|; + $option .= $locale->text('Part Number') . qq| : $form->{partnumber}
|; } if ($form->{partsgroup}) { $callback .= "&partsgroup=$form->{partsgroup}"; - $option .= $locale->text('Group').qq| : $form->{partsgroup}
|; + $option .= $locale->text('Group') . qq| : $form->{partsgroup}
|; } if ($form->{serialnumber}) { $callback .= "&serialnumber=$form->{serialnumber}"; - $option .= $locale->text('Serial Number').qq| : $form->{serialnumber}
|; + $option .= + $locale->text('Serial Number') . qq| : $form->{serialnumber}
|; } if ($form->{description}) { $callback .= "&description=$form->{description}"; $description = $form->{description}; $description =~ s/ /
/g; - $option .= $locale->text('Part Description').qq| : $form->{description}
|; + $option .= + $locale->text('Part Description') . qq| : $form->{description}
|; } if ($form->{make}) { $callback .= "&make=$form->{make}"; - $option .= $locale->text('Make').qq| : $form->{make}
|; + $option .= $locale->text('Make') . qq| : $form->{make}
|; } if ($form->{model}) { $callback .= "&model=$form->{model}"; - $option .= $locale->text('Model').qq| : $form->{model}
|; + $option .= $locale->text('Model') . qq| : $form->{model}
|; } if ($form->{drawing}) { $callback .= "&drawing=$form->{drawing}"; - $option .= $locale->text('Drawing').qq| : $form->{drawing}
|; + $option .= $locale->text('Drawing') . qq| : $form->{drawing}
|; } if ($form->{microfiche}) { $callback .= "µfiche=$form->{microfiche}"; - $option .= $locale->text('Microfiche').qq| : $form->{microfiche}
|; + $option .= $locale->text('Microfiche') . qq| : $form->{microfiche}
|; } - if ($form->{l_soldtotal}) - { + if ($form->{l_soldtotal}) { $callback .= "&soldtotal=$form->{soldtotal}"; - $option .= $locale->text('soldtotal').qq| : $form->{soldtotal}
|; + $option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|; } - @columns = $form->sort_columns(qw(number partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)); + @columns = $form->sort_columns( + qw(number partnumber 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"; @@ -800,28 +845,35 @@ sub addtop100 { if ($form->{l_lastcost}) { $form->{l_linetotallastcost} = "Y"; if (($form->{searchitems} eq 'assembly') && !$form->{bom}) { - $form->{l_linetotallastcost} = ""; + $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} = ""; + # qty is irrelevant unless bought or sold - if ($form->{bought} || $form->{sold} || $form->{onorder} || - $form->{ordered} || $form->{rfq} || $form->{quoted}) { + if ( $form->{bought} + || $form->{sold} + || $form->{onorder} + || $form->{ordered} + || $form->{rfq} + || $form->{quoted}) { $form->{l_onhand} = "Y"; - } else { + } else { $form->{l_linetotalsellprice} = ""; - $form->{l_linetotallastcost} = ""; + $form->{l_linetotallastcost} = ""; } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); + $form->{l_lastcost} = "" + if ($form->{searchitems} eq 'assembly' && !$form->{bom}); foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { @@ -836,36 +888,93 @@ sub addtop100 { $callback .= "&l_subtotal=Y"; } - $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||; + $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; $colspan = $#column_index + 1; @@ -897,25 +1006,25 @@ sub addtop100 { $callback = $form->escape($callback); if (@{ $form->{parts} }) { - $sameitem = $form->{parts}->[0]->{$form->{sort}}; + $sameitem = $form->{parts}->[0]->{ $form->{sort} }; } + # insert numbers for top100 - my $j=0; + my $j = 0; foreach $ref (@{ $form->{parts} }) { $j++; $ref->{number} = $j; - } + } + # if avaible -> insert choice here - 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"}; - + 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"}> @@ -923,24 +1032,31 @@ sub addtop100 { {"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 + push @{ $form->{parts} }, + { number => "", + partnumber => "$partnumber", + description => "$description", + unit => "$unit", + sellprice => "$sellprice", + soldtotal => "$soldtotal" }; + } #rof + } #fi + # build data for columns foreach $ref (@{ $form->{parts} }) { if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { - if ($sameitem ne $ref->{$form->{sort}}) { - &parts_subtotal; - $sameitem = $ref->{$form->{sort}}; + if ($sameitem ne $ref->{ $form->{sort} }) { + &parts_subtotal; + $sameitem = $ref->{ $form->{sort} }; } } - + $ref->{exchangerate} = 1 unless $ref->{exchangerate}; $ref->{sellprice} *= $ref->{exchangerate}; $ref->{listprice} *= $ref->{exchangerate}; - $ref->{lastcost} *= $ref->{exchangerate}; + $ref->{lastcost} *= $ref->{exchangerate}; # use this for assemblies $onhand = $ref->{onhand}; @@ -954,52 +1070,101 @@ sub addtop100 { $ref->{description} =~ s/ /
/g; - $column_data{number} = "".$form->format_amount(\%myconfig, $ref->{number}, '', " ").""; - $column_data{partnumber} = "$ref->{partnumber} "; + $column_data{number} = + "" + . $form->format_amount(\%myconfig, $ref->{number}, '', " ") + . ""; + $column_data{partnumber} = + "$ref->{partnumber} "; $column_data{description} = "$ref->{description} "; - $column_data{partsgroup} = "$ref->{partsgroup} "; - - $column_data{onhand} = "".$form->format_amount(\%myconfig, $ref->{onhand}, '', " ").""; - $column_data{sellprice} = "".$form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") . ""; - $column_data{listprice} = "".$form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") . ""; - $column_data{lastcost} = "".$form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") . ""; - - $column_data{linetotalsellprice} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2, " ").""; - $column_data{linetotallastcost} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2, " ").""; - $column_data{linetotallistprice} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2, " ").""; + $column_data{partsgroup} = "$ref->{partsgroup} "; + + $column_data{onhand} = + "" + . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") + . ""; + $column_data{sellprice} = + "" + . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + . ""; + $column_data{listprice} = + "" + . $form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") + . ""; + $column_data{lastcost} = + "" + . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") + . ""; + + $column_data{linetotalsellprice} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, + 2, " ") + . ""; + $column_data{linetotallastcost} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, + 2, " ") + . ""; + $column_data{linetotallistprice} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, + 2, " ") + . ""; if (!$ref->{assemblyitem}) { $totalsellprice += $onhand * $ref->{sellprice}; - $totallastcost += $onhand * $ref->{lastcost}; + $totallastcost += $onhand * $ref->{lastcost}; $totallistprice += $onhand * $ref->{listprice}; - $subtotalonhand += $onhand; + $subtotalonhand += $onhand; $subtotalsellprice += $onhand * $ref->{sellprice}; - $subtotallastcost += $onhand * $ref->{lastcost}; + $subtotallastcost += $onhand * $ref->{lastcost}; $subtotallistprice += $onhand * $ref->{listprice}; } - $column_data{rop} = "".$form->format_amount(\%myconfig, $ref->{rop}, '', " ").""; - $column_data{weight} = "".$form->format_amount(\%myconfig, $ref->{weight}, '', " ").""; - $column_data{unit} = "$ref->{unit} "; - $column_data{bin} = "$ref->{bin} "; + $column_data{rop} = + "" + . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . ""; + $column_data{weight} = + "" + . $form->format_amount(\%myconfig, $ref->{weight}, '', " ") + . ""; + $column_data{unit} = "$ref->{unit} "; + $column_data{bin} = "$ref->{bin} "; $column_data{priceupdate} = "$ref->{priceupdate} "; - $column_data{invnumber} = ($ref->{module} ne 'oe') ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; - $column_data{ordnumber} = ($ref->{module} eq 'oe') ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" : "$ref->{ordnumber}"; - $column_data{quonumber} = ($ref->{module} eq 'oe' && !$ref->{ordnumber}) ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; + $column_data{invnumber} = + ($ref->{module} ne 'oe') + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + : "$ref->{invnumber}"; + $column_data{ordnumber} = + ($ref->{module} eq 'oe') + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + : "$ref->{ordnumber}"; + $column_data{quonumber} = + ($ref->{module} eq 'oe' && !$ref->{ordnumber}) + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; - $column_data{image} = ($ref->{image}) ? "{image}>{image} height=32 border=0>" : " "; - $column_data{drawing} = ($ref->{drawing}) ? "{drawing}>$ref->{drawing}" : " "; - $column_data{microfiche} = ($ref->{microfiche}) ? "{microfiche}>$ref->{microfiche}" : " "; + $column_data{image} = + ($ref->{image}) + ? "{image}>{image} height=32 border=0>" + : " "; + $column_data{drawing} = + ($ref->{drawing}) + ? "{drawing}>$ref->{drawing}" + : " "; + $column_data{microfiche} = + ($ref->{microfiche}) + ? "{microfiche}>$ref->{microfiche}" + : " "; $column_data{serialnumber} = "$ref->{serialnumber}"; $column_data{soldtotal} = "$ref->{soldtotal}"; - $i++; $i %= 2; + $i++; + $i %= 2; print ""; map { print "\n$column_data{$_}" } @column_index; @@ -1011,13 +1176,22 @@ sub addtop100 { if ($form->{l_subtotal} eq 'Y') { &parts_subtotal; - }#fi + } #fi if ($form->{"l_linetotal"}) { map { $column_data{$_} = " " } @column_index; - $column_data{linetotalsellprice} = "".$form->format_amount(\%myconfig, $totalsellprice, 2, " ").""; - $column_data{linetotallastcost} = "".$form->format_amount(\%myconfig, $totallastcost, 2, " ").""; - $column_data{linetotallistprice} = "".$form->format_amount(\%myconfig, $totallistprice, 2, " ").""; + $column_data{linetotalsellprice} = + "" + . $form->format_amount(\%myconfig, $totalsellprice, 2, " ") + . ""; + $column_data{linetotallastcost} = + "" + . $form->format_amount(\%myconfig, $totallastcost, 2, " ") + . ""; + $column_data{linetotallistprice} = + "" + . $form->format_amount(\%myconfig, $totallistprice, 2, " ") + . ""; print ""; @@ -1064,9 +1238,9 @@ sub addtop100 { print qq| - - |; + |; if ($form->{menubar}) { require "$form->{path}/menu.pl"; @@ -1081,114 +1255,119 @@ sub addtop100 { |; $lxdebug->leave_sub(); -}# end addtop100 - +} # end addtop100 sub generate_report { $lxdebug->enter_sub(); - $revers = $form->{revers}; + $revers = $form->{revers}; $lastsort = $form->{lastsort}; - if (($form->{lastsort} eq "")&&($form->{sort} eq undef)) - { - $form->{revers} = 0; - $form->{lastsort} = "partnumber"; - $form->{sort} = "partnumber"; - } - else - { + if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) { + $form->{revers} = 0; + $form->{lastsort} = "partnumber"; + $form->{sort} = "partnumber"; + } else { + # switch between backward sorting of tables - if ($form->{lastsort} eq $form->{sort}) - { - if ($form->{revers}==0) - { - $form->{revers} = 1; - } - else - { - $form->{revers} = 0; - }#fi - } - else - { - $form->{revers}== 0; + if ($form->{lastsort} eq $form->{sort}) { + if ($form->{revers} == 0) { + $form->{revers} = 1; + } else { + $form->{revers} = 0; + } #fi + } else { + $form->{revers} == 0; $form->{lastsort} = $form->{sort}; - }#fi - }#fi - - $callback = "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=".$form->escape($form->{title},1); + } #fi + } #fi + $callback = + "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}&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}) { + 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')." : "; + $option .= $locale->text('Active') . " : "; } if ($form->{itemstatus} eq 'obsolete') { - $option .= $locale->text('Obsolete')." : "; + $option .= $locale->text('Obsolete') . " : "; } if ($form->{itemstatus} eq 'orphaned') { - $option .= $locale->text('Orphaned')." : "; + $option .= $locale->text('Orphaned') . " : "; } if ($form->{itemstatus} eq 'onhand') { - $option .= $locale->text('On Hand')." : "; + $option .= $locale->text('On Hand') . " : "; $form->{l_onhand} = "Y"; } if ($form->{itemstatus} eq 'short') { - $option .= $locale->text('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')." : "; + $option .= $locale->text('On Order') . " : "; } if ($form->{ordered}) { $form->{l_ordnumber} = "Y"; $callback .= "&ordered=$form->{ordered}"; - $option .= $locale->text('Ordered')." : "; + $option .= $locale->text('Ordered') . " : "; } if ($form->{rfq}) { $form->{l_quonumber} = "Y"; $callback .= "&rfq=$form->{rfq}"; - $option .= $locale->text('RFQ')." : "; + $option .= $locale->text('RFQ') . " : "; } if ($form->{quoted}) { $form->{l_quonumber} = "Y"; $callback .= ""ed=$form->{quoted}"; - $option .= $locale->text('Quoted')." : "; + $option .= $locale->text('Quoted') . " : "; } if ($form->{bought}) { $form->{l_invnumber} = "Y"; $callback .= "&bought=$form->{bought}"; - $option .= $locale->text('Bought')." : "; + $option .= $locale->text('Bought') . " : "; } if ($form->{sold}) { $form->{l_invnumber} = "Y"; $callback .= "&sold=$form->{sold}"; - $option .= $locale->text('Sold')." : "; + $option .= $locale->text('Sold') . " : "; } - if ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered} || $form->{rfq} || $form->{quoted}) { + if ( $form->{bought} + || $form->{sold} + || $form->{onorder} + || $form->{ordered} + || $form->{rfq} + || $form->{quoted}) { $form->{l_lastcost} = ""; - $form->{l_name} = "Y"; + $form->{l_name} = "Y"; if ($form->{transdatefrom}) { $callback .= "&transdatefrom=$form->{transdatefrom}"; - $option .= "\n
".$locale->text('From')." ".$locale->date(\%myconfig, $form->{transdatefrom}, 1); + $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 .= "\n
" + . $locale->text('To') + . " " + . $locale->date(\%myconfig, $form->{transdateto}, 1); } } @@ -1196,47 +1375,51 @@ sub generate_report { if ($form->{partnumber}) { $callback .= "&partnumber=$form->{partnumber}"; - $option .= $locale->text('Part Number').qq| : $form->{partnumber}
|; + $option .= $locale->text('Part Number') . qq| : $form->{partnumber}
|; } if ($form->{partsgroup}) { $callback .= "&partsgroup=$form->{partsgroup}"; - $option .= $locale->text('Group').qq| : $form->{partsgroup}
|; + $option .= $locale->text('Group') . qq| : $form->{partsgroup}
|; } if ($form->{serialnumber}) { $callback .= "&serialnumber=$form->{serialnumber}"; - $option .= $locale->text('Serial Number').qq| : $form->{serialnumber}
|; + $option .= + $locale->text('Serial Number') . qq| : $form->{serialnumber}
|; } if ($form->{description}) { $callback .= "&description=$form->{description}"; $description = $form->{description}; $description =~ s/ /
/g; - $option .= $locale->text('Part Description').qq| : $form->{description}
|; + $option .= + $locale->text('Part Description') . qq| : $form->{description}
|; } if ($form->{make}) { $callback .= "&make=$form->{make}"; - $option .= $locale->text('Make').qq| : $form->{make}
|; + $option .= $locale->text('Make') . qq| : $form->{make}
|; } if ($form->{model}) { $callback .= "&model=$form->{model}"; - $option .= $locale->text('Model').qq| : $form->{model}
|; + $option .= $locale->text('Model') . qq| : $form->{model}
|; } if ($form->{drawing}) { $callback .= "&drawing=$form->{drawing}"; - $option .= $locale->text('Drawing').qq| : $form->{drawing}
|; + $option .= $locale->text('Drawing') . qq| : $form->{drawing}
|; } if ($form->{microfiche}) { $callback .= "µfiche=$form->{microfiche}"; - $option .= $locale->text('Microfiche').qq| : $form->{microfiche}
|; + $option .= $locale->text('Microfiche') . qq| : $form->{microfiche}
|; } + # table soldtotal aktive - if ($form->{l_soldtotal}) - { + if ($form->{l_soldtotal}) { $callback .= "&soldtotal=$form->{soldtotal}"; - $option .= $locale->text('soldtotal').qq| : $form->{soldtotal}
|; + $option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|; } - @columns = $form->sort_columns(qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)); + @columns = $form->sort_columns( + qw(partnumber 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"; @@ -1244,28 +1427,35 @@ sub generate_report { if ($form->{l_lastcost}) { $form->{l_linetotallastcost} = "Y"; if (($form->{searchitems} eq 'assembly') && !$form->{bom}) { - $form->{l_linetotallastcost} = ""; + $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} = ""; + # qty is irrelevant unless bought or sold - if ($form->{bought} || $form->{sold} || $form->{onorder} || - $form->{ordered} || $form->{rfq} || $form->{quoted}) { + if ( $form->{bought} + || $form->{sold} + || $form->{onorder} + || $form->{ordered} + || $form->{rfq} + || $form->{quoted}) { $form->{l_onhand} = "Y"; - } else { + } else { $form->{l_linetotalsellprice} = ""; - $form->{l_linetotallastcost} = ""; + $form->{l_linetotallastcost} = ""; } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); + $form->{l_lastcost} = "" + if ($form->{searchitems} eq 'assembly' && !$form->{bom}); foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { @@ -1279,35 +1469,91 @@ sub generate_report { if ($form->{l_subtotal} eq 'Y') { $callback .= "&l_subtotal=Y"; } - $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||; + $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; $colspan = $#column_index + 1; @@ -1332,7 +1578,6 @@ sub generate_report { |; - # add order to callback $form->{callback} = $callback .= "&sort=$form->{sort}"; @@ -1340,22 +1585,22 @@ sub generate_report { $callback = $form->escape($callback); if (@{ $form->{parts} }) { - $sameitem = $form->{parts}->[0]->{$form->{sort}}; + $sameitem = $form->{parts}->[0]->{ $form->{sort} }; } foreach $ref (@{ $form->{parts} }) { if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { - if ($sameitem ne $ref->{$form->{sort}}) { - &parts_subtotal; - $sameitem = $ref->{$form->{sort}}; + if ($sameitem ne $ref->{ $form->{sort} }) { + &parts_subtotal; + $sameitem = $ref->{ $form->{sort} }; } } $ref->{exchangerate} = 1 unless $ref->{exchangerate}; $ref->{sellprice} *= $ref->{exchangerate}; $ref->{listprice} *= $ref->{exchangerate}; - $ref->{lastcost} *= $ref->{exchangerate}; + $ref->{lastcost} *= $ref->{exchangerate}; # use this for assemblies $onhand = $ref->{onhand}; @@ -1369,51 +1614,100 @@ sub generate_report { $ref->{description} =~ s/ /
/g; - $column_data{partnumber} = "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber} "; + $column_data{partnumber} = + "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber} "; $column_data{description} = "$ref->{description} "; - $column_data{partsgroup} = "$ref->{partsgroup} "; - - $column_data{onhand} = "".$form->format_amount(\%myconfig, $ref->{onhand}, '', " ").""; - $column_data{sellprice} = "".$form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") . ""; - $column_data{listprice} = "".$form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") . ""; - $column_data{lastcost} = "".$form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") . ""; - - $column_data{linetotalsellprice} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2, " ").""; - $column_data{linetotallastcost} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2, " ").""; - $column_data{linetotallistprice} = "".$form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2, " ").""; + $column_data{partsgroup} = "$ref->{partsgroup} "; + + $column_data{onhand} = + "" + . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") + . ""; + $column_data{sellprice} = + "" + . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + . ""; + $column_data{listprice} = + "" + . $form->format_amount(\%myconfig, $ref->{listprice}, 2, " ") + . ""; + $column_data{lastcost} = + "" + . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, " ") + . ""; + + $column_data{linetotalsellprice} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, + 2, " ") + . ""; + $column_data{linetotallastcost} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, + 2, " ") + . ""; + $column_data{linetotallistprice} = "" + . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, + 2, " ") + . ""; if (!$ref->{assemblyitem}) { $totalsellprice += $onhand * $ref->{sellprice}; - $totallastcost += $onhand * $ref->{lastcost}; + $totallastcost += $onhand * $ref->{lastcost}; $totallistprice += $onhand * $ref->{listprice}; - $subtotalonhand += $onhand; + $subtotalonhand += $onhand; $subtotalsellprice += $onhand * $ref->{sellprice}; - $subtotallastcost += $onhand * $ref->{lastcost}; + $subtotallastcost += $onhand * $ref->{lastcost}; $subtotallistprice += $onhand * $ref->{listprice}; } - $column_data{rop} = "".$form->format_amount(\%myconfig, $ref->{rop}, '', " ").""; - $column_data{weight} = "".$form->format_amount(\%myconfig, $ref->{weight}, '', " ").""; - $column_data{unit} = "$ref->{unit} "; - $column_data{bin} = "$ref->{bin} "; + $column_data{rop} = + "" + . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . ""; + $column_data{weight} = + "" + . $form->format_amount(\%myconfig, $ref->{weight}, '', " ") + . ""; + $column_data{unit} = "$ref->{unit} "; + $column_data{bin} = "$ref->{bin} "; $column_data{priceupdate} = "$ref->{priceupdate} "; - $column_data{invnumber} = ($ref->{module} ne 'oe') ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; - $column_data{ordnumber} = ($ref->{module} eq 'oe') ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" : "$ref->{ordnumber}"; - $column_data{quonumber} = ($ref->{module} eq 'oe' && !$ref->{ordnumber}) ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; + $column_data{invnumber} = + ($ref->{module} ne 'oe') + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + : "$ref->{invnumber}"; + $column_data{ordnumber} = + ($ref->{module} eq 'oe') + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + : "$ref->{ordnumber}"; + $column_data{quonumber} = + ($ref->{module} eq 'oe' && !$ref->{ordnumber}) + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; - $column_data{image} = ($ref->{image}) ? "{image}>{image} height=32 border=0>" : " "; - $column_data{drawing} = ($ref->{drawing}) ? "{drawing}>$ref->{drawing}" : " "; - $column_data{microfiche} = ($ref->{microfiche}) ? "{microfiche}>$ref->{microfiche}" : " "; + $column_data{image} = + ($ref->{image}) + ? "{image}>{image} height=32 border=0>" + : " "; + $column_data{drawing} = + ($ref->{drawing}) + ? "{drawing}>$ref->{drawing}" + : " "; + $column_data{microfiche} = + ($ref->{microfiche}) + ? "{microfiche}>$ref->{microfiche}" + : " "; $column_data{serialnumber} = "$ref->{serialnumber}"; - $column_data{soldtotal} = "".$form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ").""; + $column_data{soldtotal} = + "" + . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ") + . ""; - $i++; $i %= 2; + $i++; + $i %= 2; print ""; map { print "\n$column_data{$_}" } @column_index; @@ -1424,16 +1718,24 @@ sub generate_report { } - if ($form->{l_subtotal} eq 'Y') { &parts_subtotal; } if ($form->{"l_linetotal"}) { map { $column_data{$_} = " " } @column_index; - $column_data{linetotalsellprice} = "".$form->format_amount(\%myconfig, $totalsellprice, 2, " ").""; - $column_data{linetotallastcost} = "".$form->format_amount(\%myconfig, $totallastcost, 2, " ").""; - $column_data{linetotallistprice} = "".$form->format_amount(\%myconfig, $totallistprice, 2, " ").""; + $column_data{linetotalsellprice} = + "" + . $form->format_amount(\%myconfig, $totalsellprice, 2, " ") + . ""; + $column_data{linetotallastcost} = + "" + . $form->format_amount(\%myconfig, $totallastcost, 2, " ") + . ""; + $column_data{linetotallistprice} = + "" + . $form->format_amount(\%myconfig, $totallistprice, 2, " ") + . ""; print ""; @@ -1449,7 +1751,6 @@ sub generate_report { |; - print qq|
@@ -1465,8 +1766,8 @@ sub generate_report { {password}>|; print qq| - |; - + |; if ($form->{menubar}) { require "$form->{path}/menu.pl"; @@ -1481,9 +1782,7 @@ sub generate_report { |; $lxdebug->leave_sub(); -}#end generate_report - - +} #end generate_report sub parts_subtotal { $lxdebug->enter_sub(); @@ -1491,16 +1790,28 @@ sub parts_subtotal { map { $column_data{$_} = " " } @column_index; $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom}); - $column_data{onhand} = "".$form->format_amount(\%myconfig, $subtotalonhand, '', " ").""; - - $column_data{linetotalsellprice} = "".$form->format_amount(\%myconfig, $subtotalsellprice, 2, " ").""; - $column_data{linetotallistprice} = "".$form->format_amount(\%myconfig, $subtotallistprice, 2, " ").""; - $column_data{linetotallastcost} = "".$form->format_amount(\%myconfig, $subtotallastcost, 2, " ").""; - - $subtotalonhand = 0; + $column_data{onhand} = + "" + . $form->format_amount(\%myconfig, $subtotalonhand, '', " ") + . ""; + + $column_data{linetotalsellprice} = + "" + . $form->format_amount(\%myconfig, $subtotalsellprice, 2, " ") + . ""; + $column_data{linetotallistprice} = + "" + . $form->format_amount(\%myconfig, $subtotallistprice, 2, " ") + . ""; + $column_data{linetotallastcost} = + "" + . $form->format_amount(\%myconfig, $subtotallastcost, 2, " ") + . ""; + + $subtotalonhand = 0; $subtotalsellprice = 0; $subtotallistprice = 0; - $subtotallastcost = 0; + $subtotallastcost = 0; print ""; @@ -1513,14 +1824,12 @@ sub parts_subtotal { $lxdebug->leave_sub(); } - - sub edit { $lxdebug->enter_sub(); IC->get_part(\%myconfig, \%$form); - $form->{title} = $locale->text('Edit '.ucfirst $form->{item}); + $form->{title} = $locale->text('Edit ' . ucfirst $form->{item}); &link_part; &display_form; @@ -1528,15 +1837,15 @@ sub edit { $lxdebug->leave_sub(); } - - sub link_part { $lxdebug->enter_sub(); IC->create_links("IC", \%myconfig, \%$form); - # currencies - map { $form->{selectcurrency} .= "