X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=sql-ledger%2Fbin%2Fmozilla%2Fic.pl;h=f643c1301fd7637f49f5831ca923db11485f1c75;hb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;hp=797daee01eccf8da174da616d3e87f3d1d8a490a;hpb=b8cfd0780aa40bb07f3215bf9cb58011f5e32a35;p=freeside.git diff --git a/sql-ledger/bin/mozilla/ic.pl b/sql-ledger/bin/mozilla/ic.pl index 797daee01..f643c1301 100644 --- a/sql-ledger/bin/mozilla/ic.pl +++ b/sql-ledger/bin/mozilla/ic.pl @@ -6,6 +6,7 @@ # Email: dsimader@sql-ledger.org # Web: http://www.sql-ledger.org # +# Contributors: # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,14 +38,28 @@ require "$form->{path}/io.pl"; sub add { - $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); + %label = ( part => 'Part', + service => 'Service', + assembly => 'Assembly', + labor => 'Labor/Overhead' ); - $form->{callback} = "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; +# $locale->text('Add Part') +# $locale->text('Add Service') +# $locale->text('Add Assembly') +# $locale->text('Add Labor/Overhead') - $form->{unit} = ($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea'); + $label = "Add $label{$form->{item}}"; + $form->{title} = $locale->text($label); + + $form->{callback} = "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; + + $form->{orphaned} = 1; + + if ($form->{previousform}) { + $form->{callback} = ""; + } &link_part; - &display_form; } @@ -52,13 +67,55 @@ sub add { sub search { - $form->{title} = (ucfirst $form->{searchitems})."s"; - $form->{title} = $locale->text($form->{title}); - -# $locale->text('Parts') -# $locale->text('Services') + $form->get_partsgroup(\%myconfig, { all => 0, searchitems => $form->{searchitems}}); + + IC->get_warehouses(\%myconfig, \%$form) unless $form->{searchitems} =~ /(service|labor)/; + + if (@{ $form->{all_partsgroup} }) { + $partsgroup = qq|\n|; + + map { $partsgroup .= qq|$_->{partsgroup}\n| } @{ $form->{all_partsgroup} }; + + $partsgroup = qq| + |.$locale->text('Group').qq| + $partsgroup +|; + } + + $l_listprice = qq| + |.$locale->text('List Price').qq| +|; + $l_sellprice = qq| + |.$locale->text('Sell Price').qq| +|; + $l_lastcost = qq| + |.$locale->text('Cost').qq| +|; + $l_linetotal = qq| + |.$locale->text('Line Total').qq| +|; + $l_curr = qq| + |.$locale->text('Currency').qq| +|; + + $accrual = qq| + + |.$locale->text('Accrual').qq| + |.$locale->text('Cash').qq| + +|; + + $serialnumber = qq| + |.$locale->text('Serial Number').qq| + +|; + + $l_serialnumber = qq| + |.$locale->text('Serial Number').qq| +|; + - unless ($form->{searchitems} eq 'service') { + if ($form->{searchitems} =~ /(part|assembly)/) { $onhand = qq| |.$locale->text('On Hand').qq| @@ -67,23 +124,71 @@ sub search { $makemodel = qq| - |.$locale->text('Make').qq| + |.$locale->text('Make').qq| - |.$locale->text('Model').qq| + |.$locale->text('Model').qq| |; + + $l_makemodel = qq| + |.$locale->text('Make').qq| + |.$locale->text('Model').qq| +|; + + $l_bin = qq| + |.$locale->text('Bin').qq||; + + $l_rop = qq| + |.$locale->text('ROP').qq||; + + + $l_weight = qq| + |.$locale->text('Weight').qq||; + + + if (@{ $form->{all_warehouses} }) { + $selectwarehouse = "\n"; + + map { $selectwarehouse .= qq|$_->{description}\n| } (@{ $form->{all_warehouses} }); + + $warehouse = qq| + |.$locale->text('Warehouse').qq| + $selectwarehouse +|; + + $l_warehouse = qq| + |.$locale->text('Warehouse').qq| +|; + + + $drawing = qq| + + |.$locale->text('Drawing').qq| + + |.$locale->text('Microfiche').qq| + + +|; + + $l_drawing = qq| + + |.$locale->text('Image').qq| + |.$locale->text('Drawing').qq| + |.$locale->text('Microfiche').qq| + +|; + + } } if ($form->{searchitems} eq 'assembly') { - - $form->{title} = $locale->text('Assemblies'); - + $toplevel = qq| - |.$locale->text('Top Level').qq| + |.$locale->text('Top Level').qq| |.$locale->text('Individual Items').qq| @@ -99,30 +204,64 @@ sub search { - |.$locale->text('Sold').qq| + |.$locale->text('Sales Invoices').qq| - |.$locale->text('Ordered').qq| + |.$locale->text('Sales Orders').qq| + + + + + + + |.$locale->text('Quotations').qq| - |.$locale->text('From').qq| - - |.$locale->text('to').qq| - - - |.$locale->text('Closed').qq| + + + $accrual + + |.$locale->text('From').qq| + + |.$locale->text('To').qq| + + + + |.$locale->text('Open').qq| + |.$locale->text('Closed').qq| + + + |; + } elsif ($form->{searchitems} eq 'component') { + + $warehouse = ""; + $serialnumber = ""; + $l_serialnumber = ""; + $l_warehouse = ""; + + } elsif ($form->{searchitems} eq 'labor') { + + $warehouse = ""; + $serialnumber = ""; + $l_serialnumber = ""; + $l_sellprice = qq| + |.$locale->text('Amount').qq| +|; + $l_listprice = ""; + $l_lastcost = ""; + } else { $bought = qq| @@ -135,31 +274,43 @@ sub search { - |.$locale->text('Bought').qq| + |.$locale->text('Vendor Invoices').qq| - |.$locale->text('Sold').qq| + |.$locale->text('Sales Invoices').qq| - |.$locale->text('On Order').qq| + |.$locale->text('Purchase Orders').qq| - |.$locale->text('Ordered').qq| + |.$locale->text('Sales Orders').qq| + + + + + + + |.$locale->text('RFQ').qq| + + |.$locale->text('Quotations').qq| + $accrual |.$locale->text('From').qq| - |.$locale->text('to').qq| + |.$locale->text('To').qq| - - |.$locale->text('Closed').qq| + + + |.$locale->text('Open').qq| + |.$locale->text('Closed').qq| @@ -170,7 +321,23 @@ sub search { |; } + %title = ( all => 'Items', + part => 'Parts', + labor => 'Labor/Overhead', + service => 'Services', + assembly => 'Assemblies', + component => 'Components' + ); +# $locale->text('Items') +# $locale->text('Parts') +# $locale->text('Labor/Overhead') +# $locale->text('Services') +# $locale->text('Assemblies') +# $locale->text('Components') + + $form->{title} = $locale->text($title{$form->{searchitems}}); + $form->header; print qq| @@ -188,22 +355,22 @@ sub search { - |.$locale->text('Number').qq| + |.$locale->text('Number').qq| - |.$locale->text('Description').qq| - - |.$locale->text('Group').qq| - + |.$locale->text('Description').qq| + + + $warehouse + + + $partsgroup + $serialnumber + $makemodel - - |.$locale->text('Drawing').qq| - - |.$locale->text('Microfiche').qq| - - + $drawing $toplevel @@ -228,25 +395,27 @@ sub search { |.$locale->text('Number').qq| |.$locale->text('Description').qq| + $l_serialnumber |.$locale->text('Unit of measure').qq| + |.$locale->text('Updated').qq| + |.$locale->text('Group').qq| - |.$locale->text('List Price').qq| - |.$locale->text('Sell Price').qq| - |.$locale->text('Last Cost').qq| - |.$locale->text('Line Total').qq| + $l_listprice + $l_sellprice + $l_lastcost + $l_linetotal + $l_curr - |.$locale->text('Updated').qq| - |.$locale->text('Bin').qq| - |.$locale->text('ROP').qq| - |.$locale->text('Weight').qq| + $l_bin + $l_rop + $l_weight + $l_drawing - |.$locale->text('Image').qq| - |.$locale->text('Drawing').qq| - |.$locale->text('Microfiche').qq| - |.$locale->text('Group').qq| + $l_makemodel + $l_warehouse |.$locale->text('Subtotal').qq| @@ -264,7 +433,7 @@ sub search { {path}> {login}> -{password}> +{sessionid}> @@ -289,18 +458,47 @@ sub generate_report { } } - $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); + $warehouse = $form->escape($form->{warehouse},1); + $partsgroup = $form->escape($form->{partsgroup},1); + $title = $form->escape($form->{title},1); + + $callback = "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&warehouse=$warehouse&partsgroup=$partsgroup&title=$title&method=$form->{method}"; - IC->all_parts(\%myconfig, \%$form); + # if we have a serialnumber limit search + if ($form->{serialnumber} || $form->{l_serialnumber}) { + $form->{l_serialnumber} = "Y"; + unless ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered}) { + if ($form->{searchitems} eq 'assembly') { + $form->{sold} = $form->{ordered} = 1; + } else { + $form->{bought} = $form->{sold} = $form->{onorder} = $form->{ordered} = 1; + } + } + } + if ($form->{itemstatus} eq 'active') { $option .= $locale->text('Active')." : "; } if ($form->{itemstatus} eq 'obsolete') { + $form->{onhand} = $form->{short} = 0; + $form->{warehouse} = ""; + $form->{l_warehouse} = 0; + $option .= $locale->text('Obsolete')." : "; } if ($form->{itemstatus} eq 'orphaned') { + $form->{onhand} = $form->{short} = 0; + $form->{bought} = $form->{sold} = 0; + $form->{onorder} = $form->{ordered} = 0; + $form->{rfq} = $form->{quoted} = 0; + + $form->{warehouse} = ""; + $form->{l_warehouse} = 0; + + $form->{transdatefrom} = $form->{transdateto} = ""; + $option .= $locale->text('Orphaned')." : "; } if ($form->{itemstatus} eq 'onhand') { @@ -310,87 +508,130 @@ sub generate_report { if ($form->{itemstatus} eq 'short') { $option .= $locale->text('Short')." : "; $form->{l_onhand} = "Y"; + $form->{l_rop} = "Y" unless $form->{searchitems} eq 'labor'; + + $form->{warehouse} = ""; + $form->{l_warehouse} = 0; } if ($form->{onorder}) { $form->{l_ordnumber} = "Y"; $callback .= "&onorder=$form->{onorder}"; - $option .= $locale->text('On Order')." : "; + $option .= $locale->text('Purchase Order')." : "; } if ($form->{ordered}) { $form->{l_ordnumber} = "Y"; $callback .= "&ordered=$form->{ordered}"; - $option .= $locale->text('Ordered')." : "; + $option .= $locale->text('Sales Order')." : "; + } + if ($form->{rfq}) { + $form->{l_quonumber} = "Y"; + $callback .= "&rfq=$form->{rfq}"; + $option .= $locale->text('RFQ')." : "; } - if ($form->{closed}) { - $callback .= "&closed=$form->{closed}"; - $option .= $locale->text('Closed')." : "; + if ($form->{quoted}) { + $form->{l_quonumber} = "Y"; + $callback .= ""ed=$form->{quoted}"; + $option .= $locale->text('Quotation')." : "; } if ($form->{bought}) { $form->{l_invnumber} = "Y"; $callback .= "&bought=$form->{bought}"; - $option .= $locale->text('Bought')." : "; + $option .= $locale->text('Vendor Invoice')." : "; } if ($form->{sold}) { $form->{l_invnumber} = "Y"; $callback .= "&sold=$form->{sold}"; - $option .= $locale->text('Sold')." : "; + $option .= $locale->text('Sales Invoice')." : "; } - if ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered}) { + if ($form->{sold} || $form->{bought}) { + $label = ucfirst $form->{method}; + $option .= $locale->text($label) ." : "; + } + + if ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered} || $form->{rfq} || $form->{quoted}) { + + # warehouse stuff is meaningless + $form->{warehouse} = ""; + $form->{l_warehouse} = 0; $form->{l_lastcost} = ""; + $form->{l_name} = "Y"; + $form->{l_employee} = "Y"; + + + if ($form->{open}) { + $callback .= "&open=$form->{open}"; + $option .= $locale->text('Open'); + } + if ($form->{closed}) { + $callback .= "&closed=$form->{closed}"; + if ($form->{open}) { + $option .= " : ".$locale->text('Closed'); + } else { + $option .= $locale->text('Closed'); + } + } + 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 .= "\n".$locale->text('To')." ".$locale->date(\%myconfig, $form->{transdateto}, 1); } } + if ($form->{warehouse}) { + ($warehouse) = split /--/, $form->{warehouse}; + $option .= "".$locale->text('Warehouse')." : $warehouse"; + $form->{l_warehouse} = 0; + } + $option .= ""; if ($form->{partnumber}) { - $callback .= "&partnumber=$form->{partnumber}"; + $callback .= "&partnumber=".$form->escape($form->{partnumber},1); $option .= $locale->text('Number').qq| : $form->{partnumber}|; } + if ($form->{partsgroup}) { + ($partsgroup) = split /--/, $form->{partsgroup}; + $option .= $locale->text('Group').qq| : $partsgroup|; + } + if ($form->{serialnumber}) { + $callback .= "&serialnumber=".$form->escape($form->{serialnumber},1); + $option .= $locale->text('Serial Number').qq| : $form->{serialnumber}|; + } if ($form->{description}) { - $callback .= "&description=$form->{description}"; + $callback .= "&description=".$form->escape($form->{description},1); + $description = $form->{description}; + $description =~ s/ //g; $option .= $locale->text('Description').qq| : $form->{description}|; } if ($form->{make}) { - $callback .= "&make=$form->{make}"; + $callback .= "&make=".$form->escape($form->{make},1); $option .= $locale->text('Make').qq| : $form->{make}|; } if ($form->{model}) { - $callback .= "&model=$form->{model}"; + $callback .= "&model=".$form->escape($form->{model},1); $option .= $locale->text('Model').qq| : $form->{model}|; } if ($form->{drawing}) { - $callback .= "&drawing=$form->{drawing}"; + $callback .= "&drawing=".$form->escape($form->{drawing},1); $option .= $locale->text('Drawing').qq| : $form->{drawing}|; } if ($form->{microfiche}) { - $callback .= "µfiche=$form->{microfiche}"; + $callback .= "µfiche=".$form->escape($form->{microfiche},1); $option .= $locale->text('Microfiche').qq| : $form->{microfiche}|; } - if ($form->{partsgroup}) { - $callback .= "&partsgroup=$form->{partsgroup}"; - $option .= $locale->text('Group').qq| : $form->{partsgroup}|; - } - - @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)); + + @columns = $form->sort_columns(qw(partnumber description assemblypartnumber partsgroup make model bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost curr priceupdate weight image drawing microfiche invnumber ordnumber quonumber name employee serialnumber warehouse)); 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_linetotallastcost} = "Y" if $form->{l_lastcost}; $form->{l_linetotallistprice} = "Y" if $form->{l_listprice}; } @@ -400,7 +641,8 @@ sub generate_report { $form->{l_onhand} = ""; # qty is irrelevant unless bought or sold - if ($form->{bought} || $form->{sold} || $form->{onorder} || $form->{ordered}) { + if ($form->{bought} || $form->{sold} || $form->{onorder} || + $form->{ordered} || $form->{rfq} || $form->{quoted}) { $form->{l_onhand} = "Y"; } else { $form->{l_linetotalsellprice} = ""; @@ -408,7 +650,6 @@ sub generate_report { } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { @@ -422,50 +663,135 @@ sub generate_report { if ($form->{l_subtotal} eq 'Y') { $callback .= "&l_subtotal=Y"; } + + + IC->all_parts(\%myconfig, \%$form); + + $callback .= "&direction=$form->{direction}&oldsort=$form->{oldsort}"; + + $href = $callback; + + $form->sort_order(); + + $callback =~ s/(direction=).*\&{1}/$1$form->{direction}\&/; + + + if ($form->{searchitems} eq 'assembly' && $form->{l_partnumber}) { + # replace partnumber with partnumber_ + $ndx = 0; + foreach $item (@column_index) { + $ndx++; + last if $item eq 'partnumber'; + } + + splice @column_index, $ndx, 0, map { "partnumber_$_" } (1 .. $form->{pncol}); + $colspan = $form->{pncol} + 1; + } + + if ($form->{searchitems} eq 'component') { + if ($form->{l_partnumber}) { + # splice it in after the partnumber + $ndx = 0; + foreach $item (@column_index) { + $ndx++; + last if $item eq 'partnumber'; + } + + @a = splice @column_index, 0, $ndx; + unshift @column_index, "assemblypartnumber"; + unshift @column_index, @a; + } + } - $column_header{partnumber} = qq||.$locale->text('Number').qq||; - $column_header{description} = qq||.$locale->text('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{partnumber} = qq||.$locale->text('Number').qq||; + $column_header{description} = qq||.$locale->text('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||.$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{lastcost} = qq||.$locale->text('Cost').qq||; $column_header{rop} = qq||.$locale->text('ROP').qq||; $column_header{weight} = qq||.$locale->text('Weight').qq||; + + $column_header{make} = qq||.$locale->text('Make').qq||; + $column_header{model} = qq||.$locale->text('Model').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{invnumber} = qq||.$locale->text('Invoice Number').qq||; - $column_header{ordnumber} = qq||.$locale->text('Order Number').qq||; + $column_header{employee} = qq||.$locale->text('Employee').qq||; + + $column_header{sellprice} = qq||; + $column_header{sellprice} .= ($form->{searchitems} ne 'labor') ? $locale->text('Sell Price') : $locale->text('Amount'); + $column_header{sellprice} .= 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{curr} = qq||.$locale->text('Curr').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{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{assemblypartnumber} = qq||.$locale->text('Assembly').qq||; + + $column_header{warehouse} = qq||.$locale->text('Warehouse').qq||; + $form->header; - $colspan = $#column_index + 1; + + $i = 1; + if ($form->{searchitems} eq 'part') { + $button{'Goods & Services--Add Part'}{code} = qq| |; + $button{'Goods & Services--Add Part'}{order} = $i++; + } + if ($form->{searchitems} eq 'service') { + $button{'Goods & Services--Add Service'}{code} = qq| |; + $button{'Goods & Services--Add Service'}{order} = $i++; + } + if ($form->{searchitems} eq 'assembly') { + $button{'Goods & Services--Add Assembly'}{code} = qq| |; + $button{'Goods & Services--Add Assembly'}{order} = $i++; + } + if ($form->{searchitems} eq 'labor') { + $button{'Goods & Services--Add Labor/Overhead'}{code} = qq| |; + $button{'Goods & Services--Add Labor/Overhead'}{order} = $i++; + } + + foreach $item (split /;/, $myconfig{acs}) { + delete $button{$item}; + } print qq| -$form->{title} - + + $form->{title} + + -$option + $option - + + + + |; map { print "\n$column_header{$_}" } @column_index; print qq| - + |; @@ -479,6 +805,7 @@ sub generate_report { $sameitem = $form->{parts}->[0]->{$form->{sort}}; } + foreach $ref (@{ $form->{parts} }) { if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { @@ -489,30 +816,51 @@ sub generate_report { } $ref->{exchangerate} = 1 unless $ref->{exchangerate}; - $ref->{sellprice} *= $ref->{exchangerate}; - $ref->{listprice} *= $ref->{exchangerate}; - $ref->{lastcost} *= $ref->{exchangerate}; + $ref->{discount} *= 1; + $ref->{sellprice} = $ref->{sellprice} * (1 - $ref->{discount}); + if ($form->{l_curr}) { + if ($ref->{module} ne 'oe') { + map { $ref->{$_} = $form->round_amount($ref->{$_} / $ref->{exchangerate}, 2) } qw(sellprice listprice lastcost); + } + } else { + if ($ref->{module} eq 'oe') { + map { $ref->{$_} = $form->round_amount($ref->{$_} * $ref->{exchangerate}, 2) } qw(sellprice listprice lastcost); + } + } - $align = "left"; + # use this for assemblies $onhand = $ref->{onhand}; + $ref->{description} =~ s/ //g; + + map { $column_data{"partnumber_$_"} = " " } (1 .. $form->{pncol}); + + $column_data{partnumber} = "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{partnumber} "; + + $column_data{assemblypartnumber} = "{script}?action=edit&id=$ref->{assembly_id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{assemblypartnumber} "; + if ($ref->{assemblyitem}) { - $align = "right"; $onhand = 0 if ($form->{sold}); + + $column_data{partnumber} = " "; + + $column_data{"partnumber_$ref->{stagger}"} = "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{partnumber} "; + } + + map { $column_data{$_} = "$ref->{$_} " } qw(description partsgroup employee curr); - $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, $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{onhand} = "".$form->format_amount(\%myconfig, $ref->{onhand}, '', " ").""; + + map { $column_data{$_} = "".$form->format_amount(\%myconfig, $ref->{$_}, 2, " ") . "" } qw(sellprice listprice lastcost); $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} && $ref->{stagger} > 1) { + map { $column_data{$_} = " " } qw(linetotalsellprice linetotallastcost linetotallistprice); + } if (!$ref->{assemblyitem}) { $totalsellprice += $onhand * $ref->{sellprice}; @@ -531,13 +879,23 @@ sub generate_report { $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} "; + $ref->{module} = 'ps' if $ref->{till}; + $column_data{invnumber} = ($ref->{module} ne 'oe') ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&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}&sessionid=$form->{sessionid}&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}&sessionid=$form->{sessionid}&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{make} = "$ref->{make} "; + $column_data{model} = "$ref->{model} "; + + $column_data{serialnumber} = "$ref->{serialnumber} "; + $column_data{warehouse} = "$ref->{warehouse} "; + $i++; $i %= 2; print ""; @@ -569,12 +927,14 @@ sub generate_report { } print qq| - + + + + |; - - + print qq| @@ -587,11 +947,20 @@ sub generate_report { {path}> {login}> -{password}> +{sessionid}> +|; - + foreach $item (sort { $a->{order} <=> $b->{order} } %button) { + print $item->{code}; + } - + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } + + print qq| +