X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=6a57794fdead0979b39a9699c4e2c8666824aea4;hb=d25bd6ec1709f3c8ef07e1dab1f69469893ab6dc;hp=191277636b8d1297378f36b9ad2f09a9c97b8d20;hpb=ffea1346a870187033520ea5be4a121574802e7f;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 191277636..6a57794fd 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -427,17 +427,19 @@ sub display_row {
map { print "\n$column_data{$_}" } @column_index;
- print qq|
-
-|;
-map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
- ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i", "selected_unit_$i", "id_$i", "inventory_accno_$i", "bin_$i",
- "partsgroup_$i", "partnotes_$i", "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i", "taxaccounts_$i",
- "ordnumber_$i", "transdate_$i", "cusordnumber_$i", "longdescription_$i", "basefactor_$i"));
-print qq|
-
-|;
+ print("\n" .
+ $cgi->hidden("-name" => "unit_old_$i",
+ "-value" => $form->{"selected_unit_$i"})
+ . "\n" .
+ $cgi->hidden("-name" => "price_new_$i",
+ "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"}))
+ . "\n");
+ map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_}) . "\n"); }
+ ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i",
+ "id_$i", "inventory_accno_$i", "bin_$i", "partsgroup_$i", "partnotes_$i",
+ "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i",
+ "taxaccounts_$i", "ordnumber_$i", "transdate_$i", "cusordnumber_$i",
+ "longdescription_$i", "basefactor_$i"));
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -622,7 +624,7 @@ sub select_item {
$column_data{partnumber} =
qq|
$ref->{partnumber} | |;
$column_data{description} =
- qq|{description}>$ref->{description} | |;
+ qq|$ref->{description} | |;
$column_data{sellprice} =
qq||
. $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ")
@@ -640,18 +642,16 @@ sub select_item {
map { print "\n$column_data{$_}" } @column_index;
- print qq|
-
-|;
-map({ print($cgi->hidden("-name" => "new_$__$i", "-value" => $ref->{$_})); }
- qw(bin listprice inventory_accno income_accno expense_accno unit weight assembly taxaccounts partsgroup
- formel logdescription not_discountable part_payment_id partnodes id));
-if ($lizenzen) {
- print qq|
-
-|;
- }
+ print("\n");
+ my @new_fields =
+ qw(bin listprice inventory_accno income_accno expense_accno unit weight
+ assembly taxaccounts partsgroup formel logdescription not_discountable
+ part_payment_id partnodes id);
+ push(@new_fields, "lizenzen") if ($lizenzen);
+
+ map({ print($cgi->hidden("-name" => "new_${_}_$i",
+ "-value" => $ref->{$_})); } @new_fields);
}
print qq|
@@ -822,17 +822,10 @@ sub new_item {
. $locale->text('Service');
print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
- ("partnumber_$i", "description_$i", "rowcount", "taxaccounts", "vc", "path", "login", "password"));
-
-#
-#
-#
-#
-#
-#
-#
-#
-#
+ ("rowcount", "vc", "path", "login", "password"));
+ map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); }
+ ("partnumber", "description"));
+print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts});
print qq|
@@ -1394,7 +1387,7 @@ sub edit_e_mail {
|
|;
- &print_options;
+ print_options();
map { delete $form->{$_} }
qw(action email cc bcc subject message formname sendmode format header override);
@@ -1505,7 +1498,7 @@ sub print_options {
push @MEDIA, grep $_,
opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- (scalar keys %{ $form->{printers} } && $latex_templates) ?
+ (scalar @{ $form->{printers} } && $latex_templates) ?
opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
($latex_templates) ?
opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
@@ -1527,13 +1520,13 @@ sub print_options {
if (ref $form->{languages} eq 'ARRAY');
push @PRINTER_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{printers} }
- if (ref $form->{printers} eq 'ARRAY');
+ map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
+ if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
@SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
%template_vars = (
- display_copies => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+ display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
display_remove_draft => (!$form->{id} && $form->{draft_id}),
groupitems_checked => $form->{groupitems} ? "checked" : '',
remove_draft_checked => $form->{remove_draft} ? "checked" : ''
@@ -2113,7 +2106,7 @@ sub ship_to {
|
| . $locale->text('Contact') . qq| |
$form->{contact} |
- |
+ |
| . $locale->text('Phone') . qq| |
@@ -2134,7 +2127,7 @@ sub ship_to {
-| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub);
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
;