projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cp templates.
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
37fdda8
..
a4e027d
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-113,7
+113,7
@@
sub display_row {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $
main::cgi
;
+ my $cgi = $
::request->{cgi}
;
my $numrows = shift;
my $numrows = shift;
@@
-415,7
+415,7
@@
sub set_pricegroup {
my $form = $main::form;
my $locale = $main::locale;
my $form = $main::form;
my $locale = $main::locale;
- my $cgi = $
main::cgi
;
+ my $cgi = $
::request->{cgi}
;
_check_io_auth();
_check_io_auth();
@@
-1312,11
+1312,13
@@
sub print_form {
my $payment_id_saved = $form->{payment_id};
my $salesman_id_saved = $form->{salesman_id};
my $cp_id_saved = $form->{cp_id};
my $payment_id_saved = $form->{payment_id};
my $salesman_id_saved = $form->{salesman_id};
my $cp_id_saved = $form->{cp_id};
+ my $taxzone_id_saved = $form->{taxzone_id};
call_sub("$form->{vc}_details") if ($form->{vc});
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
call_sub("$form->{vc}_details") if ($form->{vc});
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
+ $form->{taxzone_id} = $taxzone_id_saved;
$form->{"email"} = $saved_email if ($saved_email);
$form->{"cc"} = $saved_cc if ($saved_cc);
$form->{"email"} = $saved_email if ($saved_email);
$form->{"cc"} = $saved_cc if ($saved_cc);
@@
-1794,6
+1796,8
@@
sub _render_custom_variables_inputs {
$description = $cvar->{description} . ' ';
}
$description = $cvar->{description} . ' ';
}
+ my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}";
+
push @{ $params{ROW2} }, {
line_break => $num_visible_cvars == 1,
description => $description,
push @{ $params{ROW2} }, {
line_break => $num_visible_cvars == 1,
description => $description,
@@
-1804,7
+1808,7
@@
sub _render_custom_variables_inputs {
name_prefix => 'ic_',
name_postfix => "_$params{row}",
valid => $cvar->{valid},
name_prefix => 'ic_',
name_postfix => "_$params{row}",
valid => $cvar->{valid},
- value =>
$form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"}
,
+ value =>
CVar->parse($::form->{$form_key}, $cvar)
,
}
};
}
}
};
}