S:P:Dunning: Link führt nicht mehr zum Drucken, sondern zum Mahnungsbericht, …

[kivitendo-erp.git] / SL / Controller / File.pm

diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index 4ff35db443d1babf0d811cacada29d01f6d959ca..fdfded2769f6dc7c123d86daeb735e360848df9f 100644 (file)
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -299,7 +299,10 @@ sub action_ajax_files_uploaded {
 
 sub action_download {
   my ($self) = @_;
 
 sub action_download {
   my ($self) = @_;

-  my ($id, $version) = split /_/, $::form->{id};
+
+  my $id      = $::form->{id};
+  my $version = $::form->{version};
+

   my $file = SL::File->get(id => $id );
   $file->version($version) if $version;
   my $ref  = $file->get_content;
   my $file = SL::File->get(id => $id );
   $file->version($version) if $version;
   my $ref  = $file->get_content;


@@ -396,7 +399,7 @@ sub _do_list {
   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;
   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;

-    push @object_types, qw(dunning dunning1 dunning2 dunning3) if $self->object_type eq 'invoice'; # hardcoded object types?
+    push @object_types, qw(dunning1 dunning2 dunning3 dunning_invoice dunning_orig_invoice) if $self->object_type eq 'invoice'; # hardcoded object types?

     @files = SL::File->get_all_versions(object_id   => $self->object_id,
                                         object_type => \@object_types,
                                         file_type   => $self->file_type,
     @files = SL::File->get_all_versions(object_id   => $self->object_id,
                                         object_type => \@object_types,
                                         file_type   => $self->file_type,