Merge remote-tracking branch 'origin/new/bug_8062'

[koha.git] / suggestion / suggestion.pl

diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 6bf188f..99f38eb 100755 (executable)
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -209,20 +209,13 @@ if ($op=~/else/) {
                 my $bud = GetBudget( $suggestion->{budgetid} );
                 $suggestion->{budget_name} = $bud->{budget_name} if $bud;
             }
-            foreach my $date qw(suggesteddate manageddate accepteddate) {
-                if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ) {
+            foreach my $date (qw(suggesteddate manageddate accepteddate)) {
+                if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00") {
                     $suggestion->{$date} = format_date( $suggestion->{$date} );
                 } else {
                     $suggestion->{$date} = "";
                 }
             }
-            foreach my $date ( qw(suggesteddate manageddate accepteddate) ){
-                if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
-                $suggestion->{$date}=format_date($suggestion->{$date}) ;
-                } else {
-                $suggestion->{$date}="" ;
-                }             
-            }    
         }
         push @allsuggestions,{
                             "suggestiontype"=>$criteriumvalue||"suggest",