X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDN.pm;h=f986421f7b934167fb7cff2fc6454ef8782998f7;hb=805e8da4fc4c631f7d62286fa63d8a5e69e769ab;hp=5ffb4ba6629374be03d58c791a031599577ed65c;hpb=f3d322cfd7776bebb922f3cd390bd62e4f5baf09;p=kivitendo-erp.git

diff --git a/SL/DN.pm b/SL/DN.pm
index 5ffb4ba66..f986421f7 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -211,10 +211,9 @@ sub save_dunning {
     qq|SELECT
          cfg.interest_rate, cfg.template AS formname,
          cfg.email_subject, cfg.email_body, cfg.email_attachment,
-         (SELECT fee
+         (SELECT SUM(fee)
           FROM dunning
-          WHERE dunning_id = ?
-          LIMIT 1)
+          WHERE dunning_id = ?)
          AS fee,
          (SELECT SUM(interest)
           FROM dunning
@@ -418,8 +417,6 @@ sub get_dunning {
 
   my @values;
 
-  $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/);
-
   if ($form->{customer_id}) {
     $where .= qq| AND (a.customer_id = ?)|;
     push(@values, $form->{customer_id});
@@ -429,7 +426,6 @@ sub get_dunning {
     push(@values, '%' . $form->{customer} . '%');
   }
 
-
   my %columns = (
     "ordnumber" => "a.ordnumber",
     "invnumber" => "a.invnumber",
@@ -446,7 +442,12 @@ sub get_dunning {
     push(@values, conv_i($form->{dunning_level}));
   }
 
-  $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
+  if ($form->{department_id}) {
+    $where .= qq| AND a.department_id = ?|;
+    push @values, conv_i($form->{department_id});
+  }
+
+  $form->{minamount} = $form->parse_amount($myconfig, $form->{minamount});
   if ($form->{minamount}) {
     $where .= qq| AND ((a.amount - a.paid) > ?) |;
     push(@values, $form->{minamount});
@@ -638,7 +639,11 @@ sub print_dunning {
     qq|SELECT
          cfg.interest_rate, cfg.template AS formname,
          cfg.email_subject, cfg.email_body, cfg.email_attachment,
-         d.fee, d.transdate AS dunning_date,
+         d.transdate AS dunning_date,
+         (SELECT SUM(fee)
+          FROM dunning
+          WHERE dunning_id = ?)
+         AS fee,
          (SELECT SUM(interest)
           FROM dunning
           WHERE dunning_id = ?)
@@ -654,7 +659,7 @@ sub print_dunning {
        LEFT JOIN dunning_config cfg ON (d.dunning_config_id = cfg.id)
        WHERE d.dunning_id = ?
        LIMIT 1|;
-  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, $dunning_id);
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, $dunning_id, $dunning_id);
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $form->{interest_rate}     = $form->format_amount($myconfig, $ref->{interest_rate} * 100);