$form->{title} |
@@ -140,39 +213,63 @@ sub form_header {
|
|
@@ -219,9 +308,11 @@ sub form_header {
sub list_invoices {
- @column_index = qw(invnumber transdate amount due paid selectpaid);
+ @column_index = qw(invnumber transdate amount due checked paid);
$colspan = $#column_index + 1;
+
+ $invoice = $locale->text('Invoices');
print qq|
@@ -229,16 +320,16 @@ sub list_invoices {
- |.$locale->text('Invoices').qq| |
+ $invoice |
|;
$column_data{invnumber} = qq||.$locale->text('Invoice')." | ";
$column_data{transdate} = qq||.$locale->text('Date')." | ";
$column_data{amount} = qq||.$locale->text('Amount')." | ";
- $column_data{due} = qq||.$locale->text('Due')." | ";
- $column_data{paid} = qq||.$locale->text('Applied')." | ";
- $column_data{selectpaid} = qq||.$locale->text('Paid in full')." | ";
+ $column_data{due} = qq||.$locale->text('Amount Due')." | ";
+ $column_data{paid} = qq||.$locale->text('Amount')." | ";
+ $column_data{checked} = qq||.$locale->text('Select')." | ";
print qq|
@@ -250,7 +341,6 @@ sub list_invoices {
for $i (1 .. $form->{rowcount}) {
- $form->{"selectpaid_$i"} = "checked" if $form->{"selectpaid_$i"};
map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid);
$totalamount += $form->{"amount_$i"};
@@ -269,13 +359,10 @@ sub list_invoices {
$column_data{due} = qq|$form->{"due_$i"} |
{"due_$i"}>|;
- $column_data{paid} = qq||;
- if ($form->{"selectpaid_$i"}) {
- $column_data{paid} .= qq|{"paid_$i"}>$form->{"paid_$i"} | |;
- } else {
- $column_data{paid} .= qq|{"paid_$i"}>|;
- }
- $column_data{selectpaid} = qq|{"selectpaid_$i"}> | |;
+ $column_data{paid} = qq|{"paid_$i"}> | |;
+
+ $form->{"checked_$i"} = ($form->{"checked_$i"}) ? "checked" : "";
+ $column_data{checked} = qq|{"checked_$i"}> | |;
$j++; $j %= 2;
print qq|
@@ -289,9 +376,9 @@ sub list_invoices {
map { $column_data{$_} = " | " } @column_index;
- $column_data{amount} = qq||.$form->format_amount(\%myconfig, $totalamount, 2, " ").qq| | |;
- $column_data{due} = qq||.$form->format_amount(\%myconfig, $totaldue, 2, " ").qq| | |;
- $column_data{paid} = qq||.$form->format_amount(\%myconfig, $totalpaid, 2, " ").qq| | |;
+ $column_data{amount} = qq||.$form->format_amount(\%myconfig, $totalamount, 2, " ").qq| | |;
+ $column_data{due} = qq||.$form->format_amount(\%myconfig, $totaldue, 2, " ").qq| | |;
+ $column_data{paid} = qq||.$form->format_amount(\%myconfig, $totalpaid, 2, " ").qq| | |;
print qq|
@@ -309,18 +396,45 @@ sub list_invoices {
sub form_footer {
- $form->{OP}{$form->{media}} = "checked";
+ $form->{DF}{$form->{format}} = "selected";
+
+ if ($form->{selectlanguage}) {
+ $form->{"selectlanguage"} = $form->unescape($form->{"selectlanguage"});
+ $form->{"selectlanguage"} =~ s/ selected//;
+ $form->{"selectlanguage"} =~ s/(
+
+
{rowcount}>
{path}>
{login}>
-{password}>
+{sessionid}>
@@ -328,18 +442,24 @@ sub form_footer {
if ($latex) {
print qq|
-
-{OP}{screen}> |.$locale->text('Screen');
-
- if ($myconfig{printer}) {
- print qq|
-{OP}{printer}> |.$locale->text('Printer');
- }
+|;
}
+ $media =~ s/( |