From: Waldemar Toews <waldemar.toews@opendynamic.de>
Date: Wed, 8 Jul 2015 07:07:07 +0000 (+0200)
Subject: BUG-Fix: Die Anzeige der fällige Wiedervorlagen ist falsch (zu hoch).
X-Git-Tag: release-3.5.4~2245
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a7b9212927afc0b5b02295db4f7c2fba7318508f;p=kivitendo-erp.git

BUG-Fix: Die Anzeige der fällige Wiedervorlagen ist falsch (zu hoch).

In ERP-Dokumenten werden werden "zu viele" Wiedervorlagen angezeigt.
Bei der Berechnung werden sowohl offene als auch geschlossene Wiedervorlagen berücksichtigt.
---

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index dd902ecf1..0afc2d842 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -454,7 +454,7 @@ sub form_footer {
   my $num_due;
   my $num_follow_ups;
   if ($::form->{id}) {
-    my $follow_ups = FU->follow_ups('trans_id' => $::form->{id});
+    my $follow_ups = FU->follow_ups('trans_id' => $::form->{id}, 'not_done' => 1);
 
     if (@{ $follow_ups }) {
       $num_due        = sum map { $_->{due} * 1 } @{ $follow_ups };
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index b16d11f9f..70e1c8bb0 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -483,7 +483,7 @@ sub form_footer {
   my $cgi      = $::request->{cgi};
 
   if ( $form->{id} ) {
-    my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+    my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1);
     if ( @{ $follow_ups} ) {
       $form->{follow_up_length} = scalar(@{$follow_ups});
       $form->{follow_up_due_length} = sum(map({ $_->{due} * 1 } @{ $follow_ups }));
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 608ae75e1..b033f0e62 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -902,7 +902,7 @@ sub form_footer {
   my ($follow_ups, $follow_ups_due);
 
   if ($::form->{id}) {
-    $follow_ups     = FU->follow_ups('trans_id' => $::form->{id});
+    $follow_ups     = FU->follow_ups('trans_id' => $::form->{id}, 'not_done' => 1);
     $follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
   }
 
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 5ec505a9e..c5f137f99 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -406,7 +406,7 @@ sub form_footer {
 
   # follow ups
   if ($form->{id}) {
-    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];
+    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1) || [];
     $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
   }
 
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index c4d884984..502525782 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -472,7 +472,7 @@ sub form_footer {
 
   # follow ups
   if ($form->{id}) {
-    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];
+    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1) || [];
     $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
   }
 
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index e4e43e611..639f2bad1 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -434,7 +434,7 @@ sub form_header {
   $TMPL_VAR{follow_up_trans_info} =  ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)";
 
   if ($form->{id}) {
-    my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+    my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1);
 
     if (scalar @{ $follow_ups }) {
       $TMPL_VAR{num_follow_ups}     = scalar                    @{ $follow_ups };