X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=4734d205e07e02e84951d311e5b325c60b350d4a;hb=4f82ce002979fbe9a59d5e69a53e3697b7df20c1;hp=a6308c69308d7f25e07db0d969fc7f45a81e71e8;hpb=0cd403228559232bfcdd3090398a65dab0b8338b;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index a6308c693..4734d205e 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -189,10 +189,10 @@ sub report {
$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 = "";
@@ -788,10 +788,12 @@ $jsscript
$vc |
- | . $locale->text('Bis') . qq| |
-
- $button1
- $button1_2
+ | | . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
|
@@ -1125,11 +1127,9 @@ sub generate_balance_sheet {
'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;
@@ -1666,7 +1666,7 @@ sub create_aging_subtotal_row {
sub aging {
$lxdebug->enter_sub();
- print(STDERR "Bin in Aging\n");
+
$auth->assert('general_ledger');
my $report = SL::ReportGenerator->new(\%myconfig, $form);
@@ -1714,7 +1714,11 @@ sub aging {
$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');
@@ -2342,6 +2346,8 @@ sub list_payments {
$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
@@ -2361,7 +2367,10 @@ sub list_payments {
);
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}) {
@@ -2388,7 +2397,7 @@ sub list_payments {
$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;