Mahnungsnummern in den Druckvorlagen immer verfügbar machen.

Zudem wird dir Mahnungsnummer dem Dateinnamen für den Download angehängt,
sofern nur eine Mahnung gedruckt wird. Werden mehrere Mahnungen gedruckt,
wird auch beim Erzeugen der Mahnungen das aktuelle Datum angehängt.

Behebt #2398.

diff --git a/SL/DN.pm b/SL/DN.pm
index c38733e1940f5c4a1bfdcc63c6db282beb673dd6..ebfa4f374b67556f5a311223da2f7320b00c5261 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -327,12 +327,13 @@ sub save_dunning {
 
   $form->{DUNNING_PDFS_EMAIL} = [];
 
 
   $form->{DUNNING_PDFS_EMAIL} = [];
 

+  $form->{dunning_id} = $dunning_id;
+

   $self->create_invoice_for_fees($myconfig, $form, $dbh, $dunning_id);
 
   $self->print_invoice_for_fees($myconfig, $form, $dunning_id, $dbh);
   $self->print_dunning($myconfig, $form, $dunning_id, $dbh);
 
   $self->create_invoice_for_fees($myconfig, $form, $dbh, $dunning_id);
 
   $self->print_invoice_for_fees($myconfig, $form, $dunning_id, $dbh);
   $self->print_dunning($myconfig, $form, $dunning_id, $dbh);
 

-  $form->{dunning_id} = $dunning_id;

 
   if ($send_email) {
     $self->send_email($myconfig, $form, $dunning_id, $dbh);
 
   if ($send_email) {
     $self->send_email($myconfig, $form, $dunning_id, $dbh);

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 01658ab10edf0dc9b0b56868ee5f6768707e4425..9cac44e3a6b8d6e6ea5c41dd36dd35270f37955b 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -251,7 +251,8 @@ sub save_dunning {
 
   $form->{language_id} = $saved_language_id;
 
 
   $form->{language_id} = $saved_language_id;
 

-  if($form->{DUNNING_PDFS}) {
+  if (scalar @{ $form->{DUNNING_PDFS} }) {
+    $form->{dunning_id} = strftime("%Y%m%d", localtime time) if scalar @{ $form->{DUNNING_PDFS}} > 1;

     DN->melt_pdfs(\%myconfig, $form, $form->{copies});
   }
 
     DN->melt_pdfs(\%myconfig, $form, $form->{copies});
   }
 


@@ -498,6 +499,7 @@ sub print_multiple {
     if (!$form->{force_lang}) {
       $form->{language_id} = $language_ids[$i];
     }
     if (!$form->{force_lang}) {
       $form->{language_id} = $language_ids[$i];
     }

+    $form->{dunning_id} = $dunning_id;

     DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id);
     DN->print_dunning(\%myconfig, $form, $dunning_id);
     $i++;
     DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id);
     DN->print_dunning(\%myconfig, $form, $dunning_id);
     $i++;


@@ -505,7 +507,7 @@ sub print_multiple {
   $form->{language_id} = $saved_language_id;
 
   if (scalar @{ $form->{DUNNING_PDFS} }) {
   $form->{language_id} = $saved_language_id;
 
   if (scalar @{ $form->{DUNNING_PDFS} }) {

-    $form->{dunning_id} = strftime("%Y%m%d", localtime time);
+    $form->{dunning_id} = strftime("%Y%m%d", localtime time) if scalar @{ $form->{DUNNING_PDFS}} > 1;

     DN->melt_pdfs(\%myconfig, $form, $form->{copies});
 
     if ($form->{media} eq 'printer') {
     DN->melt_pdfs(\%myconfig, $form, $form->{copies});
 
     if ($form->{media} eq 'printer') {