X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=608726ff448e4bb1d5bf419f26774795658ef089;hb=cd32c5e983a98a515c0049422db858f2c13c4d7a;hp=ae8f500bbe192c7c66e239d666c7a52760fdcb42;hpb=0bb0eb67db98f28ec8faf8dfe8c233268332f842;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index ae8f500bb..608726ff4 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -357,6 +357,9 @@ sub display_row { + + + |; @@ -422,7 +425,6 @@ sub set_pricegroup { my $rowcount = shift; $lxdebug->enter_sub(); for $j (1 .. $rowcount) { - my $pricegroup_old = $form->{"pricegroup_old_$i"}; if ($form->{PRICES}{$j}) { $len = 0; @@ -440,20 +442,26 @@ sub set_pricegroup { qq|\n|; $len += 1; + 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}) { + if ($item->{selected} && ($pricegroup_id != 0)) { $form->{"pricegroup_old_$j"} = $pricegroup_id; $form->{"price_new_$j"} = $price; $form->{"sellprice_$j"} = $price; } - if ($len >= 1) { + if ($pricegroup_id == 0) { + $form->{"price_new_$j"} = $form->{"sellprice_$j"}; + } + if ($len > 1) { $form->{"prices_$j"} = $prices; } } } } - $lxdebug->leave_sub(); } @@ -1543,7 +1551,8 @@ sub print_form { push @a, ("partnumber_$i", "description_$i", "partsgroup_$i", "serialnumber_$i", - "bin_$i", "unit_$i"); + "bin_$i", "unit_$i", + "transdate_$i", "ordnumber_$i"); } map { push @a, "${_}_description" } split / /, $form->{taxaccounts};