X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FDunning.pm;h=de4961439ac87393faf8ea1572ce8ffeb1e99c27;hb=e0900c89f30e6a0ebe9c9152cabbe4410e5b3c31;hp=4c8b70c090c1836a73a351fe8fcef46d15d67d9e;hpb=ad4bebf4dfcc48d0e313bfc4cb045de485c4d9fb;p=kivitendo-erp.git

diff --git a/SL/Presenter/Dunning.pm b/SL/Presenter/Dunning.pm
index 4c8b70c09..de4961439 100644
--- a/SL/Presenter/Dunning.pm
+++ b/SL/Presenter/Dunning.pm
@@ -3,6 +3,7 @@ package SL::Presenter::Dunning;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(dunning);
@@ -10,19 +11,25 @@ our @EXPORT_OK = qw(dunning);
 use Carp;
 
 sub dunning {
-  my ($dunning, $type, %params) = @_;
+  my ($dunning, %params) = @_;
 
   $params{display} ||= 'inline';
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $invoice = SL::DB::Manager::Invoice->find_by( id => $dunning->trans_id );
+  my $text = escape($dunning->dunning_config->dunning_description);
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="dn.pl?action=print_dunning&amp;format=pdf&amp;media=screen&amp;dunning_id=' . $dunning->dunning_id . '&amp;language_id=' . $invoice->language_id . '">',
-    escape($dunning->dunning_config->dunning_description),
-    $params{no_link} ? '' : '</a>',
-  );
+  if (! delete $params{no_link}) {
+    my @flags;
+    push @flags, 'showold=1';
+    push @flags, 'l_mails=1'      if $::instance_conf->get_email_journal;
+    push @flags, 'l_webdav=1'     if $::instance_conf->get_webdav;
+    push @flags, 'l_documents=1'  if $::instance_conf->get_doc_storage;
+
+    my $href  = 'dn.pl?action=show_dunning&dunning_id=' . $dunning->dunning_id;
+    $href    .= '&' . join '&', @flags if @flags;
+    $text     = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }