projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge von 697,698 aus unstable: BWA-Darstellung
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
ae8f500
..
608726f
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-357,6
+357,9
@@
sub display_row {
<input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
<input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
<input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
<input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
+<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
+<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
+<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
|;
|;
@@
-422,7
+425,6
@@
sub set_pricegroup {
my $rowcount = shift;
$lxdebug->enter_sub();
for $j (1 .. $rowcount) {
my $rowcount = shift;
$lxdebug->enter_sub();
for $j (1 .. $rowcount) {
-
my $pricegroup_old = $form->{"pricegroup_old_$i"};
if ($form->{PRICES}{$j}) {
$len = 0;
my $pricegroup_old = $form->{"pricegroup_old_$i"};
if ($form->{PRICES}{$j}) {
$len = 0;
@@
-440,20
+442,26
@@
sub set_pricegroup {
qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
$len += 1;
qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\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"
# 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;
}
$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;
}
}
}
}
$form->{"prices_$j"} = $prices;
}
}
}
}
-
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-1543,7
+1551,8
@@
sub print_form {
push @a,
("partnumber_$i", "description_$i",
"partsgroup_$i", "serialnumber_$i",
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};
}
map { push @a, "${_}_description" } split / /, $form->{taxaccounts};