X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=608726ff448e4bb1d5bf419f26774795658ef089;hb=cd32c5e983a98a515c0049422db858f2c13c4d7a;hp=0fe78fd2a0e542287804aa79973daaaf7574283b;hpb=ef73414c443962e695214abdf5f4387ff62cfcd3;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0fe78fd2a..608726ff4 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -254,9 +254,12 @@ sub display_row {
qq|
| |;
}
+ (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $qty_dec = length $qty_dec;
+
$column_data{qty} =
qq|format_amount(\%myconfig, $form->{"qty_$i"}, 0)
+ . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
. qq|> | |;
$column_data{ship} =
qq|
+
+
+
|;
@@ -419,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;
@@ -437,21 +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;
}
}
}
}
-
- #print (STDERR "HIER", Dumper($prices) );
$lxdebug->leave_sub();
}
@@ -1541,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};
|