X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=d83d40942d7bddcfebe9ae9566e4f445c2daf60d;hb=02e1cec838a274a87b1a1c69f9c07d2c86ce4127;hp=daba6887e5944f3d4033c541dd6cd6c698f52fac;hpb=215356761a7aa1afd6d77be3aa1997bac9cf6d0e;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index daba6887e..d83d40942 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -30,20 +30,23 @@ # Inventory Control module # #====================================================================== -#$locale->text('ea'); use POSIX qw(strftime); +use List::Util qw(max); +use List::MoreUtils qw(any); +use SL::AM; +use SL::CVar; use SL::IC; use SL::ReportGenerator; #use SL::PE; -# use strict; +use strict; #use warnings; # global imports -our ($form, $locale, %myconfig, $lxdebug); +our ($form, $locale, %myconfig, $lxdebug, $auth); require "bin/mozilla/io.pl"; require "bin/mozilla/invoice_io.pl"; @@ -52,18 +55,33 @@ require "bin/mozilla/reportgenerator.pl"; 1; +# Parserhappy(R): +# type=submit $locale->text('Add Part') +# type=submit $locale->text('Add Service') +# type=submit $locale->text('Add Assembly') +# type=submit $locale->text('Edit Part') +# type=submit $locale->text('Edit Service') +# type=submit $locale->text('Edit Assembly') +# $locale->text('Parts') +# $locale->text('Services') +# $locale->text('Inventory quantity must be zero before you can set this part obsolete!') +# $locale->text('Inventory quantity must be zero before you can set this assembly obsolete!') +# $locale->text('Part Number missing!') +# $locale->text('Service Number missing!') +# $locale->text('Assembly Number missing!') +# $locale->text('ea'); + # end of main sub add { $lxdebug->enter_sub(); - $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); - - $form->{callback} = - "$form->{script}?action=add&item=$form->{item}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; + $auth->assert('part_service_assembly_edit'); - $form->{"unit_changeable"} = 1; + my $title = 'Add ' . ucfirst $form->{item}; + $form->{title} = $locale->text($title); + $form->{callback} = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback}; + $form->{unit_changeable} = 1; IC->get_pricegroups(\%myconfig, \%$form); &link_part; @@ -75,32 +93,30 @@ sub add { sub search { $lxdebug->enter_sub(); - # 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; + $auth->assert('part_service_assembly_edit'); - # $locale->text('Parts') - # $locale->text('Services') + $form->{revers} = 0; # switch for backward sorting + $form->{lastsort} = ""; # memory for which table was sort at last time + $form->{ndxs_counter} = 0; # counter for added entries to top100 - my $is_service = $form->{searchitems} eq 'service'; - my $is_assembly = $form->{searchitems} eq 'assembly'; + my %is_xyz = map { +"is_$_" => ($form->{searchitems} eq $_) } qw(part service assembly); $form->{title} = (ucfirst $form->{searchitems}) . "s"; $form->{title} = $locale->text($form->{title}); - $form->{title} = $locale->text('Assemblies') if $is_assembly; + $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly}); $form->{jsscript} = 1; + $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'IC'); + ($form->{CUSTOM_VARIABLES_FILTER_CODE}, + $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES}, + 'include_prefix' => 'l_', + 'include_value' => 'Y'); + $form->header; - print $form->parse_html_template('ic/search', { is_assembly => $is_assembly, - is_service => $is_service, - dateformat => $myconfig{dateformat}, }); + print $form->parse_html_template('ic/search', { %is_xyz, + dateformat => $myconfig{dateformat}, }); $lxdebug->leave_sub(); } #end search() @@ -108,8 +124,12 @@ sub search { sub search_update_prices { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form); + $form->{title} = $locale->text('Update Prices'); + $form->header; print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups }); @@ -120,278 +140,263 @@ sub search_update_prices { sub confirm_price_update { $lxdebug->enter_sub(); - $form->{nextsub} = "update_prices"; - $form->header; - - map { delete $form->{$_} } qw(action header); - - print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] }); - - $lxdebug->leave_sub(); -} - -sub update_prices { - $lxdebug->enter_sub(); - - if (IC->update_prices(\%myconfig, \%$form)) { - $form->redirect($form->{update_count} . $locale->text('prices updated!')); - } else { - $form->error($locale->text('Could not update prices!')); - } - - $lxdebug->leave_sub(); -} - -sub choice { - $lxdebug->enter_sub(); - - our ($j, $lastndx); - my ($totop100); - - $form->{title} = $locale->text('Top 100 hinzufuegen'); - - $form->header; - - print qq| - - -
{script}> - - {searchitems}> - - - - |; - - print qq| - - - - - - - - - -
| . $locale->text('Part Number') . qq|| . $locale->text('Part Description') . qq|
-
|; - - print qq| - -{login}> -{password}> - - - - - - - - - - - - - - - - - - + $auth->assert('part_service_assembly_edit'); - + my @errors = (); + my $value_found = undef; - + foreach my $idx (qw(sellprice listprice), (1..$form->{price_rows})) { + my $name = $idx =~ m/\d/ ? $form->{"pricegroup_${idx}"} : $idx eq 'sellprice' ? $locale->text('Sell Price') : $locale->text('List Price'); + my $type = $idx =~ m/\d/ ? $form->{"pricegroup_type_${idx}"} : $form->{"${idx}_type"}; + my $value_idx = $idx =~ m/\d/ ? "price_${idx}" : $idx; + my $value = $form->parse_amount(\%myconfig, $form->{$value_idx}); - + if ((0 > $value) && ($type eq 'percent')) { + push @errors, $locale->text('You cannot adjust the price for pricegroup "#1" by a negative percentage.', $name); -{ndxs_counter}> + } elsif (!$value && ($form->{$value_idx} ne '')) { + push @errors, $locale->text('No valid number entered for pricegroup "#1".', $name); -{extras}>|; - - my ($partnumber, $description, $unit, $sellprice, $soldtotal); - # if choice set data - if ($form->{ndx}) { - for (my $i = 0; $i < $form->{ndxs_counter}; $i++) { + } elsif (0 < $value) { + $value_found = 1; + } + } - # 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"}; + push @errors, $locale->text('No prices will be updated because no prices have been entered.') if (!$value_found); - # insert data into top100 - push @{ $form->{parts} }, - { number => "", - partnumber => "$partnumber", - description => "$description", - unit => "$unit", - sellprice => "$sellprice", - soldtotal => "$soldtotal" }; - } #rof - } #fi + my $num_matches = IC->get_num_matches_for_priceupdate(); - $totop100 = ""; + $form->header(); - # set data for next page - 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"}; + if (@errors) { + $form->show_generic_error(join('
', @errors), 'back_button' => 1); + } - $totop100 .= qq| -{"totop100_partnumber_$i"}> -{"totop100_description_$i"}> -{"totop100_unit_$i"}> -{"totop100_sellprice_$i"}> -{"totop100_soldtotal_$i"}> - |; - } #rof - } #fi + $form->{nextsub} = "update_prices"; - print $totop100; + map { delete $form->{$_} } qw(action header); - print qq| - -
+ print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ], + num_matches => $num_matches }); - - |; $lxdebug->leave_sub(); -} #end choice +} -sub list { +sub update_prices { $lxdebug->enter_sub(); - 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'); + $auth->assert('part_service_assembly_edit'); - $form->header; - - print qq| - -
- - - - - - - - - - - - - |; + my $num_updated = IC->update_prices(\%myconfig, \%$form); - 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| - - - - - - - - |; + if (-1 != $num_updated) { + $form->redirect($locale->text('#1 prices were updated.', $num_updated)); + } else { + $form->error($locale->text('Could not update prices!')); } - print 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|
$form->{"partnumber_$j"}$form->{"description_$j"}$form->{"unit_$j"}$form->{"sellprice_$j"}$form->{"soldtotal_$j"}
- -
- - -{login}> -{password}> - - - - - - - - - - - - - - - - - - - - - - - -{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; + $lxdebug->leave_sub(); +} - print qq| - +#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 -
- - -|; - $lxdebug->leave_sub(); -} #end list() +#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| +# +#
+# +# +# +# +# +# +# +# +# +# +# +# +# |; +# +# 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('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|
$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}++; @@ -413,6 +418,8 @@ sub 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); @@ -442,7 +449,7 @@ sub addtop100 { } #fi $callback = - "$form->{script}?action=top100&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" + "$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 @@ -545,16 +552,13 @@ sub addtop100 { } 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}"; + $callback .= "&description=$form->{description}"; $description = $form->{description}; - $description =~ s/ -/
/g; - $option .= - $locale->text('Part Description') . qq| : $form->{description}
|; + $description =~ s/\n/
/g; + $option .= $locale->text('Part Description') . qq| : $form->{description}
|; } if ($form->{make}) { $callback .= "&make=$form->{make}"; @@ -614,9 +618,6 @@ sub addtop100 { } } - $form->{l_lastcost} = "" - if ($form->{searchitems} eq 'assembly' && !$form->{bom}); - foreach my $item (@columns) { if ($form->{"l_$item"} eq "Y") { push @column_index, $item; @@ -786,12 +787,12 @@ sub addtop100 { } #rof } #fi # build data for columns + my $i = 0; foreach my $ref (@{ $form->{parts} }) { - my $i = 0; if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { if ($sameitem ne $ref->{ $form->{sort} }) { - &parts_subtotal; + parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); $sameitem = $ref->{ $form->{sort} }; } } @@ -810,8 +811,7 @@ sub addtop100 { $onhand = 0 if ($form->{sold}); } - $ref->{description} =~ s/ -/
/g; + $ref->{description} =~ s/\n/
/g; $column_data{number} = "" @@ -873,15 +873,15 @@ sub addtop100 { $column_data{invnumber} = ($ref->{module} ne 'oe') - ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; $column_data{ordnumber} = ($ref->{module} eq 'oe') - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&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}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; @@ -915,7 +915,7 @@ sub addtop100 { } if ($form->{l_subtotal} eq 'Y') { - &parts_subtotal; + parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); } #fi if ($form->{"l_linetotal"}) { @@ -953,9 +953,6 @@ sub addtop100 {
{script}> -{login}> -{password}> - @@ -976,7 +973,7 @@ sub addtop100 { print $totop100; print qq| - + @@ -1013,19 +1010,53 @@ sub addtop100 { # l_linetotal l_priceupdate l_bin l_rop l_weight l_image l_drawing l_microfiche # l_partsgroup l_subtotal l_soldtotal l_deliverydate # -# hiddens: -# nextsub login password revers lastsort sort ndxs_counter +# hiddens: +# nextsub revers lastsort sort ndxs_counter # sub generate_report { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my ($revers, $lastsort, $description); + my $cvar_configs = CVar->get_configs('module' => 'IC'); + $form->{title} = (ucfirst $form->{searchitems}) . "s"; + $form->{title} =~ s/ys$/ies/; $form->{title} = $locale->text($form->{title}); - my $revers = $form->{revers}; - my $lastsort = $form->{lastsort}; + my %column_defs = ( + 'bin' => { 'text' => $locale->text('Bin'), }, + 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, + 'description' => { 'text' => $locale->text('Part Description'), }, + 'drawing' => { 'text' => $locale->text('Drawing'), }, + 'image' => { 'text' => $locale->text('Image'), }, + 'invnumber' => { 'text' => $locale->text('Invoice Number'), }, + 'lastcost' => { 'text' => $locale->text('Last Cost'), }, + 'linetotallastcost' => { 'text' => $locale->text('Extended'), }, + 'linetotallistprice' => { 'text' => $locale->text('Extended'), }, + 'linetotalsellprice' => { 'text' => $locale->text('Extended'), }, + 'listprice' => { 'text' => $locale->text('List Price'), }, + 'microfiche' => { 'text' => $locale->text('Microfiche'), }, + 'name' => { 'text' => $locale->text('Name'), }, + 'onhand' => { 'text' => $locale->text('Qty'), }, + 'ordnumber' => { 'text' => $locale->text('Order Number'), }, + 'partnumber' => { 'text' => $locale->text('Part Number'), }, + 'partsgroup' => { 'text' => $locale->text('Group'), }, + 'priceupdate' => { 'text' => $locale->text('Updated'), }, + 'quonumber' => { 'text' => $locale->text('Quotation'), }, + 'rop' => { 'text' => $locale->text('ROP'), }, + 'sellprice' => { 'text' => $locale->text('Sell Price'), }, + 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, + 'soldtotal' => { 'text' => $locale->text('soldtotal'), }, + 'transdate' => { 'text' => $locale->text('Transdate'), }, + 'unit' => { 'text' => $locale->text('Unit'), }, + 'weight' => { 'text' => $locale->text('Weight'), }, + ); + + $revers = $form->{revers}; + $lastsort = $form->{lastsort}; # sorting and direction of sorting # ToDO: change this to the simpler field+direction method @@ -1043,10 +1074,10 @@ sub generate_report { } #fi # special case if we have a serialnumber limit search - # serialnumbers are only given in invoices and orders, + # serialnumbers are only given in invoices and orders, # so they can only pop up in bought, sold, rfq, and quoted stuff - $form->{no_sn_joins} = 'Y' if ( !$form->{bought} && !$form->{sold} - && !$form->{rfq} && !$form->{quoted} + $form->{no_sn_joins} = 'Y' if ( !$form->{bought} && !$form->{sold} + && !$form->{rfq} && !$form->{quoted} && ($form->{l_serialnumber} || $form->{serialnumber})); # special case for any checkbox of bought | sold | onorder | ordered | rfq | quoted. @@ -1095,6 +1126,7 @@ sub generate_report { drawing => $locale->text('Drawing') . ": '$form->{drawing}'", microfiche => $locale->text('Microfiche') . ": '$form->{microfiche}'", l_soldtotal => $locale->text('soldtotal'), + ean => $locale->text('EAN') . ": '$form->{ean}'", ); my @itemstatus_keys = qw(active obsolete orphaned onhand short); @@ -1109,13 +1141,18 @@ sub generate_report { # generate callback and optionstrings my @options; - for my $key (@itemstatus_keys, @callback_keys) { + for my $key (@itemstatus_keys, @callback_keys) { next if ($form->{itemstatus} ne $key && !$form->{$key}); push @options, $optiontexts{$key}; } # special case for lastcost - $form->{l_lastcost} = "" if $form->{ledgerchecks}; + if ($form->{ledgerchecks}){ + # ledgerchecks don't know about sellprice or lastcost. they just return a + # price. so rename sellprice to price, and drop lastcost. + $column_defs{sellprice}{text} = $locale->text('Price'); + $form->{l_lastcost} = "" + } if ($form->{description}) { $description = $form->{description}; @@ -1125,12 +1162,7 @@ sub generate_report { 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} = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if $form->{l_lastcost}; $form->{l_linetotallistprice} = "Y" if $form->{l_listprice}; } @@ -1155,46 +1187,26 @@ sub generate_report { } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); - IC->all_parts(\%myconfig, \%$form); - my @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 deliverydate); + my @columns = qw( + partnumber description partsgroup bin onhand rop unit listprice + linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost + priceupdate weight image drawing microfiche invnumber ordnumber quonumber + transdate name serialnumber soldtotal deliverydate ean + ); - my %column_defs = ( - 'bin' => { 'text' => $locale->text('Bin'), }, - 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, - 'description' => { 'text' => $locale->text('Part Description'), }, - 'drawing' => { 'text' => $locale->text('Drawing'), }, - 'image' => { 'text' => $locale->text('Image'), }, - 'invnumber' => { 'text' => $locale->text('Invoice Number'), }, - 'lastcost' => { 'text' => $locale->text('Last Cost'), }, - 'linetotallastcost' => { 'text' => $locale->text('Extended'), }, - 'linetotallistprice' => { 'text' => $locale->text('Extended'), }, - 'linetotalsellprice' => { 'text' => $locale->text('Extended'), }, - 'listprice' => { 'text' => $locale->text('List Price'), }, - 'microfiche' => { 'text' => $locale->text('Microfiche'), }, - 'name' => { 'text' => $locale->text('Name'), }, - 'onhand' => { 'text' => $locale->text('Qty'), }, - 'ordnumber' => { 'text' => $locale->text('Order Number'), }, - 'partnumber' => { 'text' => $locale->text('Part Number'), }, - 'partsgroup' => { 'text' => $locale->text('Group'), }, - 'priceupdate' => { 'text' => $locale->text('Updated'), }, - 'quonumber' => { 'text' => $locale->text('Quotation'), }, - 'rop' => { 'text' => $locale->text('ROP'), }, - 'sellprice' => { 'text' => $locale->text('Sell Price'), }, - 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, - 'soldtotal' => { 'text' => $locale->text('soldtotal'), }, - 'unit' => { 'text' => $locale->text('Unit'), }, - 'weight' => { 'text' => $locale->text('Weight'), }, - ); + my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; + my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs }; + my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables; - map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns; + push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; + + %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen + map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns; map { $column_defs{$_}->{align} = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal); - my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, map { "l_$_" } @columns); + my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns); my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables); my @sort_full = qw(partnumber description onhand soldtotal deliverydate); @@ -1223,6 +1235,7 @@ sub generate_report { 'attachment_basename' => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time), ); $report->set_options_from_form(); + $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv'; $report->set_columns(%column_defs); $report->set_column_order(@columns); @@ -1231,12 +1244,27 @@ sub generate_report { $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1); + CVar->add_custom_variables_to_report('module' => 'IC', + 'trans_id_field' => 'id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => $form->{parts}); + + CVar->add_custom_variables_to_report('module' => 'IC', + 'sub_module' => sub { $_[0]->{ioi} }, + 'trans_id_field' => 'ioi_id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => $form->{parts}); + my @subtotal_columns = qw(sellprice listprice lastcost); my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns); my %totals = map { $_ => 0 } @subtotal_columns; my $idx = 0; my $same_item = $form->{parts}[0]{ $form->{sort} } if (scalar @{ $form->{parts} }); + my $defaults = AM->get_defaults(); + # postprocess parts foreach my $ref (@{ $form->{parts} }) { @@ -1269,6 +1297,8 @@ sub generate_report { map { $row->{$_}{data} = $form->format_amount(\%myconfig, $ref->{$_}); } qw(onhand rop weight soldtotal); + $row->{weight}->{data} .= ' ' . $defaults->{weightunit}; + if (!$ref->{assemblyitem}) { foreach my $col (@subtotal_columns) { $totals{$col} += $onhand * $ref->{$col}; @@ -1280,7 +1310,7 @@ sub generate_report { # set module stuff if ($ref->{module} eq 'oe') { - my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{type}), 'id=' . E($ref->{trans_id}), 'callback'); + my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); $row->{ordnumber}{link} = $edit_oe_link; $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber}); @@ -1336,40 +1366,41 @@ sub generate_report { sub parts_subtotal { $lxdebug->enter_sub(); - - # imports - our (%column_data, @column_index); - our ($subtotalonhand, $totalsellprice, $totallastcost, $totallistprice, $subtotalsellprice, $subtotallastcost, $subtotallistprice); - map { $column_data{$_} = " " } @column_index; - $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom}); + $auth->assert('part_service_assembly_edit'); + + my (%column_data); + my ($column_index, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice) = @_; + + map { $column_data{$_} = " " } @{ $column_index }; + $$subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom}); $column_data{onhand} = "" - . $form->format_amount(\%myconfig, $subtotalonhand) + . $form->format_amount(\%myconfig, $$subtotalonhand) . ""; $column_data{linetotalsellprice} = "" - . $form->format_amount(\%myconfig, $subtotalsellprice, 2) + . $form->format_amount(\%myconfig, $$subtotalsellprice, 2) . ""; $column_data{linetotallistprice} = "" - . $form->format_amount(\%myconfig, $subtotallistprice, 2) + . $form->format_amount(\%myconfig, $$subtotallistprice, 2) . ""; $column_data{linetotallastcost} = "" - . $form->format_amount(\%myconfig, $subtotallastcost, 2) + . $form->format_amount(\%myconfig, $$subtotallastcost, 2) . ""; - $subtotalonhand = 0; - $subtotalsellprice = 0; - $subtotallistprice = 0; - $subtotallastcost = 0; + $$subtotalonhand = 0; + $$subtotalsellprice = 0; + $$subtotallistprice = 0; + $$subtotallastcost = 0; print ""; - map { print "\n$column_data{$_}" } @column_index; + map { print "\n$column_data{$_}" } @{ $column_index }; print qq| @@ -1380,6 +1411,9 @@ sub parts_subtotal { sub edit { $lxdebug->enter_sub(); + + $auth->assert('part_service_assembly_edit'); + # show history button $form->{javascript} = qq||; #/show hhistory button @@ -1387,7 +1421,8 @@ sub edit { $form->{"original_partnumber"} = $form->{"partnumber"}; - $form->{title} = $locale->text('Edit ' . ucfirst $form->{item}); + my $title = 'Edit ' . ucfirst $form->{item}; + $form->{title} = $locale->text($title); &link_part; &display_form; @@ -1398,6 +1433,8 @@ sub edit { sub link_part { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + IC->create_links("IC", \%myconfig, \%$form); # currencies @@ -1459,10 +1496,7 @@ sub link_part { if (@{ $form->{all_partsgroup} }) { $form->{selectpartsgroup} = qq||; - foreach my $item (@{ $form->{payment_terms} }) { - if ($form->{payment_id} eq $item->{id}) { - $payment .= qq||; - } else { - $payment .= qq||; - } - } + $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS', + 'partsgroup' => 'all_partsgroup', + 'vendors' => 'ALL_VENDORS',); - if (($rows = $form->numtextrows($form->{notes}, 40)) < 2) { - $rows = 4; - } - - $notes = - qq||; - if (($rows = $form->numtextrows($form->{description}, 40)) > 1) { - $description = - qq||; - } else { - $description = - qq||; - } - - $ean = qq||; - - foreach my $item (split / /, $form->{taxaccounts}) { - $form->{"IC_tax_$item"} = ($form->{"IC_tax_$item"}) ? "checked" : ""; - } - IC->retrieve_buchungsgruppen(\%myconfig, $form); - if (@{ $form->{BUCHUNGSGRUPPEN} }) { - foreach my $item (@{ $form->{BUCHUNGSGRUPPEN} }) { - if ($item->{id} == $form->{buchungsgruppen_id}) { - $form->{selectbuchungsgruppe} .= - "