X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=3383316ace35b6504d51637818a490ab4a4d27fa;hb=893bff3a5c0106b467578b470deac53f87173689;hp=f2ca8a9294402060220869190525e0a0fd059285;hpb=9f795a104880cd2fd6515afa90bc3af6b284bc83;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index f2ca8a929..3383316ac 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -30,9 +30,9 @@ # Inventory Control module # #====================================================================== -#$locale->text('ea'); use POSIX qw(strftime); +use List::Util qw(max); use SL::IC; use SL::ReportGenerator; @@ -59,6 +59,14 @@ require "bin/mozilla/reportgenerator.pl"; # 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 @@ -67,13 +75,9 @@ sub add { $auth->assert('part_service_assembly_edit'); - $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); - - $form->{callback} = - "$form->{script}?action=add&item=$form->{item}" - unless $form->{callback}; - - $form->{"unit_changeable"} = 1; + $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); + $form->{callback} = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback}; + $form->{unit_changeable} = 1; IC->get_pricegroups(\%myconfig, \%$form); &link_part; @@ -87,32 +91,22 @@ sub search { $auth->assert('part_service_assembly_edit'); - # 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; + $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 - # $locale->text('Parts') - # $locale->text('Services') - - 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{assembly}); $form->{jsscript} = 1; $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() @@ -160,199 +154,199 @@ sub update_prices { $lxdebug->leave_sub(); } -sub choice { - $lxdebug->enter_sub(); - - $auth->assert('part_service_assembly_edit'); - - our ($j, $lastndx); - my ($totop100); - - $form->{title} = $locale->text('Top 100 hinzufuegen'); - - $form->header; - - push @custom_hiddens, qw(searchitems title bom titel revers lastsort sort ndxs_counter extras); - push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice); - my @HIDDENS = ( - +{ name => 'row', value => $j }, - +{ name => 'nextsub', value => 'item_selected' }, - +{ name => 'test', value => 'item_selected' }, - +{ name => 'lastndx', value => $lastndx }, - map(+{ name => $_, value => $form->{$_} }, @custom_hiddens), - ); - - my ($partnumber, $description, $unit, $sellprice, $soldtotal); - # if choice set data -# if ($form->{ndx}) { -# for my $i (0 .. $form->{ndxs_counter}) { +#sub choice { +# $lxdebug->enter_sub(); # -# # 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"}, - } +# $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 -# $totop100 .= qq| +#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 - - print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, PARTS => \@PARTS }); - - $lxdebug->leave_sub(); -} #end choice - -sub list { - $lxdebug->enter_sub(); - - $auth->assert('part_service_assembly_edit'); - - our ($lastndx); - our ($partnumber, $description, $unit, $sellprice, $soldtotal); - - my @sortorders = ("", "partnumber", "description", "all"); - my $sortorder = $sortorders[($form->{description} ? 2 : 0) + ($form->{partnumber} ? 1 : 0)]; - IC->get_parts(\%myconfig, \%$form, $sortorder); - - $form->{title} = $locale->text('Top 100 hinzufuegen'); - - $form->header; - - print qq| - - - - - - - - - - - - - - - |; - - 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() +# |; +# } #rof +# } #fi +# +# print $totop100; +# +# print qq| +# +# +# +# +# +#|; +# $lxdebug->leave_sub(); +#} #end list() sub top100 { $lxdebug->enter_sub(); @@ -389,7 +383,7 @@ sub addtop100 { $form->{top100} = "top100"; $form->{l_soldtotal} = "Y"; -# $form->{soldtotal} = "soldtotal"; + $form->{soldtotal} = "soldtotal"; $form->{sort} = "soldtotal"; $form->{l_qty} = "N"; $form->{l_linetotal} = ""; @@ -938,7 +932,7 @@ sub addtop100 { print $totop100; print qq| - + @@ -986,6 +980,7 @@ sub generate_report { my ($revers, $lastsort, $description); $form->{title} = (ucfirst $form->{searchitems}) . "s"; + $form->{title} =~ s/ys$/ies/; $form->{title} = $locale->text($form->{title}); my $revers = $form->{revers}; @@ -1463,14 +1458,13 @@ sub form_header { $form->{eur} = $eur; # config dumps into namespace - yuck $form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" }; $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1; + $form->{notes_rows} = max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40); map { $form->{"is_$_"} = ($form->{item} eq $_) } qw(part service assembly); map { $form->{$_} =~ s/"/"/g; } qw(unit); - $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS'); - - $rows = 4 if $rows = $form->numtextrows($form->{notes}, 40) < 2; - $form->{notes_rows} = $rows; + $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS', + 'partsgroup' => 'all_partsgroup'); IC->retrieve_buchungsgruppen(\%myconfig, $form); @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} }; @@ -1478,7 +1472,7 @@ sub form_header { # use JavaScript Calendar or not (yes!) $form->{jsscript} = 1; - $units = AM->retrieve_units(\%myconfig, $form, $form->{"item"} eq "service" ? "service" : "dimension"); + $units = AM->retrieve_units(\%myconfig, $form); $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ]; $form->{fokus} = "ic.partnumber"; @@ -1497,101 +1491,7 @@ sub form_footer { $auth->assert('part_service_assembly_edit'); - if ($form->{item} eq "assembly") { - - print qq| - - - - - - - -
| . $locale->text('Total') . qq| | . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) . qq|
- - - {assembly_rows}> -|; - } - - print qq| - - - - {vc}> - -
- - - -
- - |; - - unless ($form->{item} eq "service") { - print qq| - {makemodel_rows}> - |; - } - - print qq| - {price_rows}>|; - - print qq| - |; - - if ($form->{id}) { - - if (!$form->{previousform}) { - print qq| - |; - } - - if ($form->{orphaned}) { - if (!$form->{previousform}) { - if ($form->{item} eq 'assembly') { - if (!$form->{onhand}) { - print qq| - |; - } - } else { - print qq| - |; - } - } - } - } - - if (!$form->{previousform}) { - if ($form->{menubar}) { - require "bin/mozilla/menu.pl"; - &menubar; - } - } -# button for saving history - if($form->{id} ne "") { - print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; - } -# /button for saving history - print qq| - - - - - - - -|; + print $form->parse_html_template('ic/form_footer'); $lxdebug->leave_sub(); } @@ -1600,32 +1500,8 @@ sub makemodel_row { $lxdebug->enter_sub(); my ($numrows) = @_; - print qq| - - - - - - - -|; - - for my $i (1 .. $numrows) { - $form->{"make_$i"} =~ s/\"/"/g; - $form->{"model_$i"} =~ s/\"/"/g; - print qq| - - - - -|; - } - - print qq| -
| . $locale->text('Make') . qq|| . $locale->text('Model') . qq|
- - -|; + my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows; + print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 }); $lxdebug->leave_sub(); } @@ -1886,13 +1762,6 @@ sub save { $form->error($locale->text('Description must not be empty!')) unless $form->{description}; $form->error($locale->text('Partnumber must not be set to empty!')) if $form->{id} && !$form->{partnumber}; - # expand dynamic strings - # $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!') - # save part $lxdebug->message($LXDebug::DEBUG1, "ic.pl: sellprice in save = $form->{sellprice}\n"); if (IC->save(\%myconfig, \%$form) == 3) {