X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=fad711ce8ed26a0c9ee469bd2332c5578b1a463e;hb=c184bce36ecd18049541dccaaa38d212fb6170cf;hp=547acf7df6d81e22bedbc6edf135668f9f284e27;hpb=b3eb24ef367a8702a5535558cfaa8ebc5d297f2e;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 547acf7df..fad711ce8 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -33,7 +33,9 @@ use POSIX qw(strftime); use List::Util qw(max); +use List::MoreUtils qw(any); +use SL::AM; use SL::IC; use SL::ReportGenerator; @@ -99,7 +101,7 @@ sub search { $form->{title} = (ucfirst $form->{searchitems}) . "s"; $form->{title} = $locale->text($form->{title}); - $form->{title} = $locale->text('Assemblies') if ($is_xyz{assembly}); + $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly}); $form->{jsscript} = 1; @@ -130,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(); } @@ -145,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!')); } @@ -574,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; @@ -1114,8 +1145,6 @@ sub generate_report { } } - $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom}); - IC->all_parts(\%myconfig, \%$form); my @columns = @@ -1196,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} }) { @@ -1228,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}; @@ -1464,7 +1497,9 @@ sub form_header { map { $form->{$_} =~ s/"/"/g; } qw(unit); $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS', - 'partsgroup' => 'all_partsgroup'); + '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} }; @@ -1475,14 +1510,17 @@ sub form_header { $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(); } @@ -1501,6 +1539,7 @@ sub makemodel_row { my ($numrows) = @_; 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(); @@ -1534,10 +1573,16 @@ sub assembly_row { # save form variables in a previousform variable foreach my $key (sort keys %$form) { + next unless ref $form->{$key} eq '' && $form->{$key}; + next if $key =~ /^select/; # get rid of these stupid select things # escape ampersands $form->{$key} =~ s/&/%26/g; - $previousform .= qq|$key=$form->{$key}&|; + if (any { $key eq $_ } qw(sellprice listprice lastcost)) { + $previousform .= sprintf qq|%s=%s&|, $key, $form->format_amount(\%myconfig, $form->{$key}); + } else { + $previousform .= qq|$key=$form->{$key}&|; + } } chop $previousform; $previousform = $form->escape($form->escape($previousform, 1)); @@ -1559,11 +1604,11 @@ sub assembly_row { . $locale->text('Part Number') . qq||; $column_header{description} = - qq|| . $locale->text('Part Description') . qq||; + qq|| . $locale->text('Part Description') . qq||; $column_header{lastcost} = - qq|| . $locale->text('Purchase Price') . qq||; + qq|| . $locale->text('Purchase Prices') . qq||; $column_header{total} = - qq|| . $locale->text('Extended') . qq||; + qq|| . $locale->text('Sale Prices') . qq||; $column_header{bom} = qq|| . $locale->text('BOM') . qq||; $column_header{partsgroup} = qq|| . $locale->text('Group') . qq||; @@ -1587,9 +1632,9 @@ sub assembly_row { $form->{"partnumber_$i"} =~ s/\"/"/g; $linetotal = - $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2); - $line_purchase_price = - $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"}, 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung + $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); #lastcost == purchase_price | ungenaue datenbankfeld-uebersetzung $form->{assemblytotal} += $linetotal; $form->{assembly_purchase_price_total} += $line_purchase_price; @@ -1672,11 +1717,24 @@ sub assembly_row { {"id_$i"}> {"sellprice_$i"}> + {"lastcost_$i"}> {"weight_$i"}> + {"price_factor_id_$i"}> + {"price_factor_$i"}> |; } print qq| + + + | . $locale->text('Totals') . qq| + | . $form->format_amount(\%myconfig, $form->{assembly_purchase_price_total}, 2) . + qq| + | . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) . + qq| + + @@ -1688,6 +1746,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}; @@ -1820,7 +1881,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 {