X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=06397315919188a5538d157b0e8ba99a42cf5db8;hb=7011fd23ae5457ee62f14a3ff37af5a344f4041d;hp=ec0c5803538af8243933929e9ec37d0a50ff6322;hpb=2740f3f03035bd1db6d32edaceca6c413ed81496;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index ec0c58035..063973159 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -30,10 +30,12 @@ # 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::IC; use SL::ReportGenerator; @@ -59,6 +61,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 +77,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 +93,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; - - # $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->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() @@ -136,12 +132,42 @@ sub confirm_price_update { $auth->assert('part_service_assembly_edit'); + my @errors = (); + my $value_found = false; + + 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); + + } elsif (!$value && ($form->{$value_idx} ne '')) { + push @errors, $locale->text('No valid number entered for pricegroup "#1".', $name); + + } elsif (0 < $value) { + $value_found = 1; + } + } + + push @errors, $locale->text('No prices will be updated because no prices have been entered.') if (!$value_found); + + my $num_matches = IC->get_num_matches_for_priceupdate(); + + $form->header(); + + if (@errors) { + $form->show_generic_error(join('
', @errors), 'back_button' => 1); + } + $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 ] }); + + print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ], + num_matches => $num_matches }); $lxdebug->leave_sub(); } @@ -151,8 +177,10 @@ sub update_prices { $auth->assert('part_service_assembly_edit'); - if (IC->update_prices(\%myconfig, \%$form)) { - $form->redirect($form->{update_count} . $locale->text('prices updated!')); + my $num_updated = IC->update_prices(\%myconfig, \%$form); + + if (-1 != $num_updated) { + $form->redirect($locale->text('#1 prices were updated.', $num_updated)); } else { $form->error($locale->text('Could not update prices!')); } @@ -160,199 +188,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 +417,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} = ""; @@ -580,9 +608,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; @@ -938,7 +963,7 @@ sub addtop100 { print $totop100; print qq| - + @@ -975,7 +1000,7 @@ 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: +# hiddens: # nextsub revers lastsort sort ndxs_counter # sub generate_report { @@ -986,6 +1011,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}; @@ -1007,10 +1033,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. @@ -1073,7 +1099,7 @@ 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}; } @@ -1119,8 +1145,6 @@ sub generate_report { } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); - IC->all_parts(\%myconfig, \%$form); my @columns = @@ -1201,6 +1225,8 @@ sub generate_report { 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} }) { @@ -1233,6 +1259,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}; @@ -1244,7 +1272,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->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback'); $row->{ordnumber}{link} = $edit_oe_link; $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber}); @@ -1300,7 +1328,7 @@ sub generate_report { sub parts_subtotal { $lxdebug->enter_sub(); - + $auth->assert('part_service_assembly_edit'); # imports @@ -1463,15 +1491,15 @@ 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', - 'partsgroup' => 'all_partsgroup'); - $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', + 'vendors' => 'ALL_VENDORS',); + IC->retrieve_buchungsgruppen(\%myconfig, $form); @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} }; @@ -1479,17 +1507,20 @@ 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->{defaults} = AM->get_defaults(); + $form->{fokus} = "ic.partnumber"; $form->header; - print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, - ALL_UNITS => $form->{ALL_UNITS}, - BUCHUNGSGRUPPEN => $form->{BUCHUNGSGRUPPEN}, - payment_terms => $form->{payment_terms}, - all_partsgroup => $form->{all_partsgroup}}); + #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, + # ALL_UNITS => $form->{ALL_UNITS}, + # BUCHUNGSGRUPPEN => $form->{BUCHUNGSGRUPPEN}, + # payment_terms => $form->{payment_terms}, + # all_partsgroup => $form->{all_partsgroup}}); + print $form->parse_html_template('ic/form_header'); $lxdebug->leave_sub(); } @@ -1498,101 +1529,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,33 +1537,10 @@ sub form_footer { 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; + delete @{$form}{grep { m/^make_\d+/ || m/^model_\d+/ } keys %{ $form }}; + print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 }); $lxdebug->leave_sub(); } @@ -1634,13 +1548,12 @@ sub makemodel_row { sub assembly_row { $lxdebug->enter_sub(); my ($numrows) = @_; - my (@column_index, %column_data, %column_header); - my ($nochange, $callback, $previousform, $linetotal, $href); + my (@column_index); + my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href); our ($deliverydate); # ToDO: cjeck if this indeed comes from global context - @column_index = - qw(runningnumber qty unit bom partnumber description partsgroup total); + @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total); if ($form->{previousform}) { $nochange = 1; @@ -1655,149 +1568,90 @@ sub assembly_row { # delete action map { delete $form->{$_} } qw(action header); - $previousform = ""; - # save form variables in a previousform variable - foreach my $key (sort keys %$form) { + $previousform = $form->escape($form->escape(join '&', map { + sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$key}) : $form->{$key} + } grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form )); - # escape ampersands - $form->{$key} =~ s/&/%26/g; - $previousform .= qq|$key=$form->{$key}&|; - } - chop $previousform; - $previousform = $form->escape($form->escape($previousform, 1)); $form->{callback} = $callback; - $form->{assemblytotal} = 0; + $form->{assembly_purchase_price_total} = 0; $form->{weight} = 0; - } - $column_header{runningnumber} = - qq|| . $locale->text('No.') . qq||; - $column_header{qty} = - qq|| . $locale->text('Qty') . qq||; - $column_header{unit} = - qq|| . $locale->text('Unit') . qq||; - $column_header{partnumber} = - qq|| - . $locale->text('Part Number') - . qq||; - $column_header{description} = - qq|| . $locale->text('Part Description') . qq||; - $column_header{total} = - qq|| . $locale->text('Extended') . qq||; - $column_header{bom} = qq|| . $locale->text('BOM') . qq||; - $column_header{partsgroup} = qq|| . $locale->text('Group') . qq||; - print qq| - - | . $locale->text('Individual Items') . qq| - - - - - -|; - - map { print "\n$column_header{$_}" } @column_index; + my %header = ( + runningnumber => { text => $locale->text('No.'), nowrap => 1, width => '5%' }, + qty => { text => $locale->text('Qty'), nowrap => 1, width => '10%' }, + unit => { text => $locale->text('Unit'), nowrap => 1, width => '5%' }, + partnumber => { text => $locale->text('Part Number'), nowrap => 1, width => '20%' }, + description => { text => $locale->text('Part Description'), nowrap => 1, width => '50%' }, + lastcost => { text => $locale->text('Purchase Prices'), nowrap => 1, width => '50%' }, + total => { text => $locale->text('Sale Prices'), nowrap => 1, }, + bom => { text => $locale->text('BOM'), }, + partsgroup => { text => $locale->text('Group'), }, + ); - print qq| - -|; + my @ROWS; for my $i (1 .. $numrows) { - $form->{"partnumber_$i"} =~ s/\"/"/g; - - $linetotal = - $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2); - $form->{assemblytotal} += $linetotal; - - $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); + my (%row, @row_hiddens); - $linetotal = $form->format_amount(\%myconfig, $linetotal, 2); + $form->{"partnumber_$i"} =~ s/\"/"/g; + $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4); + $line_purchase_price = $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4); + $form->{assemblytotal} += $linetotal; + $form->{assembly_purchase_price_total} += $line_purchase_price; + $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); + $linetotal = $form->format_amount(\%myconfig, $linetotal, 2); + $line_purchase_price = $form->format_amount(\%myconfig, $line_purchase_price, 2); + $href = qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|; + map { $row{$_}{data} = "" } qw(qty unit partnumber description bom partsgroup runningnumber); + + # last row if (($i >= 1) && ($i == $numrows)) { - - if ($nochange) { - map { $column_data{$_} = qq|| } - qw(qty unit partnumber description bom partsgroup); - } else { - - map { $column_data{$_} = qq|| } qw(runningnumber unit bom); - - $column_data{qty} = - qq||; - $column_data{partnumber} = - qq||; - $column_data{description} = - qq||; - $column_data{partsgroup} = - qq||; - + if (!$form->{previousform}) { + $row{partnumber}{data} = qq||; + $row{qty}{data} = qq||; + $row{description}{data} = qq||; + $row{partsgroup}{data} = qq||; } - + # other rows } else { - if ($form->{previousform}) { - $column_data{partnumber} = - qq||; - $column_data{qty} = - qq||; - - $column_data{bom} = - qq||; - - $column_data{partsgroup} = - qq||; - + push @row_hiddens, qw(qty bom); + $row{partnumber}{data} = $form->{"partnumber_$i"}; + $row{qty}{data} = $form->{"qty_$i"}; + $row{bom}{data} = $form->{"bom_$i"} ? "x" : " "; + $row{qty}{align} = 'right'; } else { - $href = - qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|; - $column_data{partnumber} = - qq||; - $column_data{runningnumber} = - qq||; - $column_data{qty} = - qq||; - - $form->{"bom_$i"} = ($form->{"bom_$i"}) ? "checked" : ""; - $column_data{bom} = - qq||; - - $column_data{partsgroup} = - qq||; + $row{partnumber}{data} = qq|$form->{"partnumber_$i"}|; + $row{qty}{data} = qq||; + $row{runningnumber}{data} = qq||; + $row{bom}{data} = sprintf qq||, + $form->{"bom_$i"} ? 'checked' : ''; } - - $column_data{unit} = - qq||; - $column_data{description} = - qq||; + push @row_hiddens, qw(unit description partnumber partsgroup); + $row{unit}{data} = $form->{"unit_$i"}; + $row{description}{data} = $form->{"description_$i"}; + $row{partsgroup}{data} = $form->{"partsgroup_$i"}; + $row{bom}{align} = 'center'; } - $column_data{total} = qq||; - - $column_data{deliverydate} = qq||; - - print qq| - |; + $row{lastcost}{data} = $line_purchase_price; + $row{total}{data} = $linetotal; + $row{deliverydate}{data} = $deliverydate; + $row{lastcost}{align} = 'right'; + $row{total}{align} = 'right'; + $row{deliverydate}{align} = 'right'; - map { print "\n$column_data{$_}" } @column_index; + push @row_hiddens, qw(id sellprice lastcost weight price_factor_id price_factor); + $row{hiddens} = [ map +{ name => "${_}_$i", value => $form->{"${_}_$i"} }, @row_hiddens ]; - print qq| - - {"id_$i"}> - {"sellprice_$i"}> - {"weight_$i"}> -|; + push @ROWS, \%row; } - print qq| -
$form->{"partnumber_$i"}$form->{"qty_$i"}{"bom_$i"}>|; - $column_data{bom} .= ($form->{"bom_$i"}) ? "x" : " "; - $column_data{bom} .= qq|$form->{"partsgroup_$i"}$form->{"partnumber_$i"}{"bom_$i"}>$form->{"partsgroup_$i"}$form->{"unit_$i"}$form->{"description_$i"}$linetotal$deliverydate
- - -|; + print $form->parse_html_template('ic/assembly_row', { COLUMNS => \@column_index, ROWS => \@ROWS, HEADER => \%header }); $lxdebug->leave_sub(); } @@ -1805,6 +1659,9 @@ sub assembly_row { sub update { $lxdebug->enter_sub(); + # parse pricegroups. and no, don't rely on check_form for this... + map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows}; + if ($form->{item} eq "assembly") { my $i = $form->{assembly_rows}; @@ -1879,21 +1736,14 @@ sub save { } if (!$form->{buchungsgruppen_id}) { - $form->error($locale->text("Parts must have an entry type.") . " " . - $locale->text("If you see this message, you most likely just setup your LX-Office and haven't added any entry types. If this is the case, the option is accessible for administrators in the System menu.") + $form->error($locale->text("Parts must have an entry type.") . " " . + $locale->text("If you see this message, you most likely just setup your LX-Office and haven't added any entry types. If this is the case, the option is accessible for administrators in the System menu.") ); } $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) { @@ -1944,7 +1794,8 @@ sub save { # change/add values for assembly item map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno price_factor_id); - $form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"}; + # das ist __voll__ bekloppt, dass so auszurechnen jb 22.5.09 + #$form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"}; $form->{weight} += $form->{"weight_$i"} * $form->{"qty_$i"}; } else {