X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=67a7d9ec5f00f50d5ff334a4909deadba79759fe;hb=996ddb70dc0d35be7a72e981ab38011a13d09484;hp=33cb5502f97f6fa026b26a8cf99b04216f378111;hpb=773c2abe4775300e523e582e722fb802e46aa844;p=kivitendo-erp.git

diff --git a/SL/DN.pm b/SL/DN.pm
index 33cb5502f..67a7d9ec5 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -513,7 +513,7 @@ sub get_invoices {
   $form->{DUNNINGS} = [];
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    next if !$ref->{terms} || ($ref->{pastdue} < $ref->{terms});
+    next if ($ref->{pastdue} < $ref->{terms});
 
     $ref->{interest} = $form->round_amount($ref->{interest}, 2);
     push(@{ $form->{DUNNINGS} }, $ref);
@@ -598,7 +598,21 @@ sub get_dunning {
     push(@values, $form->{dunningto});
   }
 
-  $query =
+  my %sort_columns = (
+    'dunning_description' => [ qw(dn.dunning_description customername invnumber) ],
+    'customername'        => [ qw(customername invnumber) ],
+    'invnumber'           => [ qw(a.invnumber) ],
+    'transdate'           => [ qw(a.transdate a.invnumber) ],
+    'duedate'             => [ qw(a.duedate a.invnumber) ],
+    'dunning_date'        => [ qw(dunning_date a.invnumber) ],
+    'dunning_duedate'     => [ qw(dunning_duedate a.invnumber) ],
+    );
+
+  my $sortdir   = !defined $form->{sortdir}    ? 'ASC'         : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortkey   = $sort_columns{$form->{sort}} ? $form->{sort} : 'customername';
+  my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+  my $query =
     qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount,
          ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
          da.interest, dn.dunning_description, da.transdate AS dunning_date,
@@ -607,7 +621,7 @@ sub get_dunning {
        JOIN customer ct ON (a.customer_id = ct.id), dunning da
        LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id)
        $where
-       ORDER BY name, a.id|;
+       ORDER BY $sortorder|;
 
   $form->{DUNNINGS} = selectall_hashref_query($form, $dbh, $query, @values);
 
@@ -844,7 +858,7 @@ sub print_invoice_for_fees {
   $form->{interest}   = $form->round_amount($interest,        2);
   $form->{invamount}  = $form->round_amount($fee + $interest, 2);
   $form->{dunning_id} = $dunning_id;
-  $form->{formname}   = "${template}";
+  $form->{formname}   = "${template}_invoice";
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_}, 2) } qw(fee interest invamount);