X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=06397315919188a5538d157b0e8ba99a42cf5db8;hb=7011fd23ae5457ee62f14a3ff37af5a344f4041d;hp=378b94b0225853a27558e31fcab5a8c2793e1d32;hpb=485793035567c690544e86bbbef2dece5374afd6;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 378b94b02..063973159 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1548,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 lastcost total); + @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total); if ($form->{previousform}) { $nochange = 1; @@ -1569,176 +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) { - 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; - 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)); - $form->{callback} = $callback; + $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 )); + $form->{callback} = $callback; $form->{assemblytotal} = 0; $form->{assembly_purchase_price_total} = 0; $form->{weight} = 0; - } - $column_header{runningnumber} = - 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| | $form->{"partnumber_$i"} | |; - $column_data{qty} = - qq|$form->{"qty_$i"} | |; - - $column_data{bom} = - qq|{"bom_$i"}>|; - $column_data{bom} .= ($form->{"bom_$i"}) ? "x" : " "; - $column_data{bom} .= qq| | |; - - $column_data{partsgroup} = - qq|$form->{"partsgroup_$i"} | |; - + 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|$form->{"partnumber_$i"} | |; - $column_data{runningnumber} = - qq||; - $column_data{qty} = - qq| | |; - - $form->{"bom_$i"} = ($form->{"bom_$i"}) ? "checked" : ""; - $column_data{bom} = - qq| | {"bom_$i"}> | |; - - $column_data{partsgroup} = - qq|$form->{"partsgroup_$i"} | |; + $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|$form->{"unit_$i"} | |; - $column_data{description} = - qq|$form->{"description_$i"} | |; + 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{lastcost} = qq|$line_purchase_price | |; - $column_data{total} = qq|$linetotal | |; - - $column_data{deliverydate} = qq|$deliverydate | |; + $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'; - 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| | -