Das Release ist heute.

[kivitendo-erp.git] / SL / DN.pm

diff --git a/SL/DN.pm b/SL/DN.pm
index 711a884..587379b 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -61,12 +61,9 @@ sub get_config {
   }
 
   $query =
-    qq|SELECT
-         dunning_create_invoices_for_fees, dunning_ar_amount_fee,
-         dunning_ar_amount_interest,       dunning_ar
+    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar
        FROM defaults|;
-  ($form->{create_invoices_for_fees}, $form->{AR_amount_fee},
-   $form->{AR_amount_interest},       $form->{AR}           ) = selectrow_query($form, $dbh, $query);
+  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);
 
   $dbh->disconnect();
 
@@ -93,7 +90,8 @@ sub save_config {
                  $form->{"email_subject_$i"}, $form->{"email_body_$i"},
                  $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"},
                  $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f',
-                 $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}));
+                 $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}),
+                 $form->{"create_invoices_for_fees_$i"} ? 't' : 'f');
       if ($form->{"id_$i"}) {
         $query =
           qq|UPDATE dunning_config SET
@@ -101,7 +99,8 @@ sub save_config {
                email_subject = ?, email_body = ?,
                template = ?, fee = ?, interest_rate = ?,
                active = ?, auto = ?, email = ?,
-               email_attachment = ?, payment_terms = ?, terms = ?
+               email_attachment = ?, payment_terms = ?, terms = ?,
+               create_invoices_for_fees = ?
              WHERE id = ?|;
         push(@values, conv_i($form->{"id_$i"}));
       } else {
@@ -109,7 +108,7 @@ sub save_config {
           qq|INSERT INTO dunning_config
                (dunning_level, dunning_description, email_subject, email_body,
                 template, fee, interest_rate, active, auto, email,
-                email_attachment, payment_terms, terms)
+                email_attachment, payment_terms, terms, create_invoices_for_fees)
              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
       }
       do_query($form, $dbh, $query, @values);
@@ -121,14 +120,8 @@ sub save_config {
     }
   }
 
-  $query  = qq|UPDATE defaults SET dunning_create_invoices_for_fees = ?|;
-  @values = ($form->{create_invoices_for_fees} ? 't' : 'f');
-
-  if ($form->{create_invoices_for_fees}) {
-    $query .= qq|, dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|;
-    push @values, conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR});
-  }
-
+  $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|;
+  @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}));
   do_query($form, $dbh, $query, @values);
 
   $dbh->commit();
@@ -144,19 +137,20 @@ sub create_invoice_for_fees {
 
   my ($query, @values, $sth, $ref);
 
-  $query =
-    qq|SELECT
-         dunning_create_invoices_for_fees, dunning_ar_amount_fee,
-         dunning_ar_amount_interest, dunning_ar
-       FROM defaults|;
-  ($form->{create_invoices_for_fees}, $form->{AR_amount_fee},
-   $form->{AR_amount_interest},       $form->{AR}           ) = selectrow_query($form, $dbh, $query);
+  $query = qq|SELECT dcfg.create_invoices_for_fees
+              FROM dunning d
+              LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
+              WHERE d.dunning_id = ?|;
+  my ($create_invoices_for_fees) = selectrow_query($form, $dbh, $query, $dunning_id);
 
-  if (!$form->{create_invoices_for_fees}) {
+  if (!$create_invoices_for_fees) {
     $main::lxdebug->leave_sub();
     return;
   }
 
+  $query = qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar FROM defaults|;
+  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);
+
   $query =
     qq|SELECT
          fee,
@@ -462,6 +456,12 @@ sub get_invoices {
     push(@values, $form->{minamount});
   }
 
+  $query =
+    qq|SELECT id
+       FROM dunning_config
+       WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
+  my ($id_for_max_dunning_level) = selectrow_query($form, $dbh, $query);
+
   $query =
     qq|SELECT
          a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
@@ -486,16 +486,19 @@ sub get_invoices {
        LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id)
        LEFT JOIN dunning_config nextcfg ON
          (nextcfg.id =
-           (SELECT id
-            FROM dunning_config
-            WHERE dunning_level >
-              COALESCE((SELECT dunning_level
-                        FROM dunning_config
-                        WHERE id = a.dunning_config_id
-                        ORDER BY dunning_level DESC
-                        LIMIT 1),
-                       0)
-            LIMIT 1))
+           COALESCE(
+             (SELECT id
+              FROM dunning_config
+              WHERE dunning_level >
+                COALESCE((SELECT dunning_level
+                          FROM dunning_config
+                          WHERE id = a.dunning_config_id
+                          ORDER BY dunning_level DESC
+                          LIMIT 1),
+                         0)
+              ORDER BY dunning_level ASC
+              LIMIT 1)
+             , ?))
        LEFT JOIN dunning d ON ((d.trans_id = a.id) AND (cfg.dunning_level = d.dunning_level))
 
        WHERE (a.paid < a.amount)
@@ -504,7 +507,7 @@ sub get_invoices {
        $where
 
        ORDER BY a.id, transdate, duedate, name|;
-  my $sth = prepare_execute_query($form, $dbh, $query, @values);
+  my $sth = prepare_execute_query($form, $dbh, $query, $id_for_max_dunning_level, @values);
 
   $form->{DUNNINGS} = [];
 
@@ -684,7 +687,8 @@ sub print_dunning {
          ar.transdate,       ar.duedate,      ar.customer_id,
          ar.invnumber,       ar.ordnumber,
          ar.amount,          ar.netamount,    ar.paid,
-         ar.amount - ar.paid AS open_amount
+         ar.amount - ar.paid AS open_amount,
+         ar.amount - ar.paid + da.fee + da.interest AS linetotal
 
        FROM dunning da
        LEFT JOIN dunning_config dcfg ON (dcfg.id = da.dunning_config_id)
@@ -698,7 +702,7 @@ sub print_dunning {
       map({ $form->{"dn_$_"} = []; } keys(%{$ref}));
       $first = 0;
     }
-    map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest);
+    map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref;
   }
@@ -707,7 +711,7 @@ sub print_dunning {
   $query =
     qq|SELECT
          c.id AS customer_id, c.name,         c.street,       c.zipcode, c.city,
-         c.country,           c.department_1, c.department_2, c.email
+         c.country,           c.department_1, c.department_2, c.email, c.customernumber
        FROM dunning d
        LEFT JOIN ar         ON (d.trans_id = ar.id)
        LEFT JOIN customer c ON (ar.customer_id = c.id)