Mahnungsbericht: Dokumente nur für ersten Eintrag eines Mahnlaufs anzeigen

[kivitendo-erp.git] / bin / mozilla / dn.pl

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 5634c90..9422da3 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -447,19 +447,10 @@ sub show_dunning {
       $row->{language} = { };
     }
 
-    if ($::instance_conf->get_doc_storage) {
-      # object_types dunning1-dunning3 are the dunnings for the according levels.
-      my @files  = SL::File->get_all_versions(object_id   => $ref->{id},
-                                              object_type => 'dunning' . $ref->{dunning_level},
-                                              file_type   => 'document',);
-      # object_type  dunning is the dunning invoice with the fees.
-      push @files, SL::File->get_all_versions(object_id   => $ref->{id},
+    if ($::instance_conf->get_doc_storage && $first_row_for_dunning) {
+      my @files  = SL::File->get_all_versions(object_id   => $ref->{dunning_id},
                                               object_type => 'dunning',
                                               file_type   => 'document',);
-      # object_type  dunning_orig_invoice is the original dunned invoice.
-      push @files, SL::File->get_all_versions(object_id   => $ref->{id},
-                                              object_type => 'dunning_orig_invoice',
-                                              file_type   => 'document',);
       if (scalar @files) {
         my $html          = join '<br>', map { SL::Presenter::FileObject::file_object($_) } @files;
         my $text          = join "\n",   map { $_->file_name                              } @files;
@@ -561,6 +552,11 @@ sub print_multiple {
     $form->{dunning_id} = $dunning_id;
     DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id);
     DN->print_dunning(\%myconfig, $form, $dunning_id);
+
+    # print original dunned invoices, if they where printed on dunning run
+    my $dunnings = SL::DB::Manager::Dunning->get_all(where => [dunning_id => $dunning_id, original_invoice_printed => 1]);
+    DN->print_original_invoice(\%myconfig, $form, $dunning_id, $_->trans_id) for @$dunnings;
+
     $i++;
   }
   $form->{language_id} = $saved_language_id;