SEPA-Export ISO20022 konforme Feldinhalte

[mfinanz.git] / SL / Controller / File.pm

diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index 8d2e9f2bdeb7eb272906d2377321d6003763390f..ee41dd3c86e10c29c373af96452f0142baf9f21d 100644 (file)
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -173,21 +173,25 @@ sub action_ajax_rename {
 
   } else {
     # normal rename
 
   } else {
     # normal rename

+    my $res;
+

     eval {
     eval {

-      my $res = $file->rename($::form->{to});
+      $res = $file->rename($::form->{to});

       $main::lxdebug->message(LXDebug->DEBUG2(), "rename result=".$res);
       $main::lxdebug->message(LXDebug->DEBUG2(), "rename result=".$res);

-      if ($res > SL::File::RENAME_OK) {
-        $self->js->flash('error',
-                         $res == SL::File::RENAME_EXISTS      ? $::locale->text('File still exists !')
-                       : $res == SL::File::RENAME_SAME        ? $::locale->text('Same Filename !')
-                       :                                        $::locale->text('File not exists !'))->render;
-        return 1;
-      }

       1;
     } or do {
       $self->js->flash(       'error', t8('internal error (see details)'))
                ->flash_detail('error', $@)->render;
       return;
       1;
     } or do {
       $self->js->flash(       'error', t8('internal error (see details)'))
                ->flash_detail('error', $@)->render;
       return;

+    };
+
+    if ($res != SL::File::RENAME_OK) {
+      $self->js->flash('error',
+                         $res == SL::File::RENAME_EXISTS ? $::locale->text('File still exists !')
+                       : $res == SL::File::RENAME_SAME   ? $::locale->text('Same Filename !')
+                       :                                   $::locale->text('File not exists !'))
+        ->render;
+      return;

     }
   }
   $self->is_global($::form->{is_global});
     }
   }
   $self->is_global($::form->{is_global});


@@ -369,8 +373,11 @@ sub _do_list {
   my @files;
   $main::lxdebug->message(LXDebug->DEBUG2(), "do_list: object_id=".$self->object_id." object_type=".$self->object_type." file_type=".$self->file_type." json=".$json);
   if ( $self->file_type eq 'document' ) {
   my @files;
   $main::lxdebug->message(LXDebug->DEBUG2(), "do_list: object_id=".$self->object_id." object_type=".$self->object_type." file_type=".$self->file_type." json=".$json);
   if ( $self->file_type eq 'document' ) {

+    my @object_types;
+    push @object_types, $self->object_type;
+    push @object_types, ('dunning','dunning1','dunning2','dunning3') if $self->object_type eq 'invoice';

     @files   = SL::File->get_all_versions(object_id   => $self->object_id  ,
     @files   = SL::File->get_all_versions(object_id   => $self->object_id  ,

-                                          object_type => $self->object_type,
+                                          object_type => \@object_types,

                                           file_type   => $self->file_type  );
 
     $main::lxdebug->message(LXDebug->DEBUG2(), "cnt1=".scalar(@files));
                                           file_type   => $self->file_type  );
 
     $main::lxdebug->message(LXDebug->DEBUG2(), "cnt1=".scalar(@files));