X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=d65347fbbcc32e1936c070da428e59caa43c4d39;hb=860bcda0f04f99d1f832b518011eb278520f1afe;hp=e91c47b29ae8821f19673118b216d006a1437cec;hpb=9caaa245e1bc3309a7d8f198228dbfd9d4555bee;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index e91c47b29..d65347fbb 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|
@@ -1430,12 +1423,14 @@ sub edit_e_mail {
sub send_email {
$lxdebug->enter_sub();
- $old_form = new Form;
+ my $callback = $form->{script} . "?action=edit";
+ map({ $callback .= "\&${_}=" . E($form->{$_}); }
+ qw(login password path type id));
- map { $old_form->{$_} = $form->{$_} } keys %$form;
- $old_form->{media} = $form->{oldmedia};
+ print_form("return");
- &print_form($old_form);
+ $form->{callback} = $callback;
+ $form->redirect();
$lxdebug->leave_sub();
}
@@ -1525,7 +1520,7 @@ sub print_options {
if (ref $form->{languages} eq 'ARRAY');
push @PRINTER_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{printers} }
+ map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
if (ref $form->{printers} eq 'ARRAY');
@SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
@@ -1944,6 +1939,8 @@ sub print_form {
$form->update_status(\%myconfig)
if ($form->{media} eq 'queue' && $form->{id});
+ return $lxdebug->leave_sub() if ($old_form eq "return");
+
if ($old_form) {
$old_form->{"${inv}number"} = $form->{"${inv}number"};
@@ -2130,7 +2127,7 @@ sub ship_to {
|
-| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub);
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
;