$value_2 = "";
$trigger_2 = "trigger2";
} elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $name_1 = "";
- $id_1 = "";
- $value_1 = "";
- $trigger_1 = "";
+ $name_1 = "fromdate";
+ $id_1 = "fromdate";
+ $value_1 = "$form->{fromdate}";
+ $trigger_1 = "trigger1";
$name_2 = "todate";
$id_2 = "todate";
$value_2 = "";
<td>$vc</td>
</tr>
<tr>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td>
- $button1
- $button1_2
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
</td>
</tr>
<input type=hidden name=type value=statement>
'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), },
'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), },
'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), },
- 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
+ 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
);
-
-
my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
map { $column_defs{$_}->{visible} = 1 } @columns;
sub aging {
$lxdebug->enter_sub();
- print(STDERR "Bin in Aging\n");
+
$auth->assert('general_ledger');
my $report = SL::ReportGenerator->new(\%myconfig, $form);
$form->{title} = sprintf($locale->text('Ap aging on %s'), $form->{todate});
}
- push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ if ($form->{fromdate}) {
+ push @options, $locale->text('for Period') . " " . $locale->text('From') . " " .$locale->date(\%myconfig, $form->{fromdate}, 1) . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ } else {
+ push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ }
my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
if ($previous_ctid != $ref->{ctid}) {
$row->{statement}->{raw_data} =
- $cgi->hidden('-name' => "customer_id_${row_idx}", '-value' => $ref->{ctid})
- . $cgi->checkbox('-name' => "statement_${row_idx}", '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
+ $cgi->hidden('-name' => "customer_id_" . ($row_idx + 1), '-value' => $ref->{ctid})
+ . $cgi->checkbox('-name' => "statement_" . ($row_idx + 1), '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
$row->{ct}->{data} = $ref->{name};
$row_idx++;
$option = $locale->text('Department') . " : $department";
}
+ report_generator_set_default_sort('transdate', 1);
+
RP->payments(\%myconfig, \%$form);
my @hidden_variables = qw(account title department reference source memo fromdate todate
);
my %column_alignment = ('paid' => 'right');
- map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;
+ foreach my $name (grep { $_ ne 'paid' } @columns) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=${name}&sortdir=$sortdir";
+ }
my @options;
if ($form->{fromdate}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
}
if ($form->{todate}) {
- push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
}
my $report = SL::ReportGenerator->new(\%myconfig, $form);
$report->set_export_options('list_payments', @hidden_variables);
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
my $total_paid = 0;