X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c5b4fdf47f0959a9cb7546fe907ff5b14330f7b3..c2666ce5e39d304257f21983e035628e03d9cd17:/bin/mozilla/io.pl diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 03fd32ace..4291cf55d 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -399,7 +399,10 @@ sub display_row { |; if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) { - my $reqdate_term = ($form->{type} eq 'invoice')?'deliverydate':'reqdate'; # invoice uses a different term for the same thing. + my $reqdate_term = + ($form->{type} eq 'invoice') + ? 'deliverydate' + : 'reqdate'; # invoice uses a different term for the same thing. print qq| ${$reqdate_term}  |; @@ -441,9 +444,10 @@ sub set_pricegroup { $prices = ''; $price = 0; foreach $item (@{ $form->{PRICES}{$j} }) { + #$price = $form->round_amount($myconfig, $item->{price}, 5); #$price = $form->format_amount($myconfig, $item->{price}, 2); - $price = $item->{price}; + $price = $item->{price}; $pricegroup_id = $item->{pricegroup_id}; $pricegroup = $item->{pricegroup}; @@ -452,10 +456,11 @@ sub set_pricegroup { qq|\n|; $len += 1; -# map { -# $form->{"${_}_$j"} = -# $form->format_amount(\%myconfig, $form->{"${_}_$j"}) -# } qw(sellprice price_new price_old); + + # map { + # $form->{"${_}_$j"} = + # $form->format_amount(\%myconfig, $form->{"${_}_$j"}) + # } qw(sellprice price_new price_old); # set new selectedpricegroup_id and prices for "Preis" if ($item->{selected} && ($pricegroup_id != 0)) { @@ -771,39 +776,40 @@ sub display_form { &{"$form->{display_form}"}; exit; } -# if ( $form->{print_and_post} -# && $form->{second_run} -# && ($form->{action} eq "display_form")) { -# for (keys %$form) { $old_form->{$_} = $form->{$_} } -# $old_form->{rowcount}++; -# -# #$form->{rowcount}--; -# #$form->{rowcount}--; -# -# $form->{print_and_post} = 0; -# -# &print_form($old_form); -# exit; -# } -# -# $form->{action} = ""; -# $form->{resubmit} = 0; -# -# if ($form->{print_and_post} && !$form->{second_run}) { -# $form->{second_run} = 1; -# $form->{action} = "display_form"; -# $form->{rowcount}--; -# my $rowcount = $form->{rowcount}; -# -# # get pricegroups for parts -# IS->get_pricegroups_for_parts(\%myconfig, \%$form); -# -# # build up html code for prices_$i -# set_pricegroup($rowcount); -# -# $form->{resubmit} = 1; -# -# } + + # if ( $form->{print_and_post} + # && $form->{second_run} + # && ($form->{action} eq "display_form")) { + # for (keys %$form) { $old_form->{$_} = $form->{$_} } + # $old_form->{rowcount}++; + # + # #$form->{rowcount}--; + # #$form->{rowcount}--; + # + # $form->{print_and_post} = 0; + # + # &print_form($old_form); + # exit; + # } + # + # $form->{action} = ""; + # $form->{resubmit} = 0; + # + # if ($form->{print_and_post} && !$form->{second_run}) { + # $form->{second_run} = 1; + # $form->{action} = "display_form"; + # $form->{rowcount}--; + # my $rowcount = $form->{rowcount}; + # + # # get pricegroups for parts + # IS->get_pricegroups_for_parts(\%myconfig, \%$form); + # + # # build up html code for prices_$i + # set_pricegroup($rowcount); + # + # $form->{resubmit} = 1; + # + # } &form_header; $numrows = ++$form->{rowcount}; @@ -1264,7 +1270,7 @@ sub print_options { $form->{DF}{ $form->{format} } = "selected"; $form->{OP}{ $form->{media} } = "selected"; $form->{SM}{ $form->{sendmode} } = "selected"; - + if ($form->{type} eq 'purchase_order') { $type = qq|