[followup] (bug #3710) all itemtypes if none selected

diff --git a/C4/Search.pm b/C4/Search.pm
index 6f06ea6..dce4e2d 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1741,12 +1741,21 @@ sub SearchAcquisitions{
         }else{
             $str .= "AND biblioitems.itemtype=? ";
         }
+        
+        if(scalar(@$itemtypes) == 0){
+            my $itypes = GetItemTypes();
+            for my $key (keys %$itypes){
+                push @$itemtypes, $key;
+            }
+        }
+        
         @loopcriteria= @$itemtypes;
     }elsif ($criteria=~/itemcallnumber/){
         $str .= "AND (items.itemcallnumber LIKE CONCAT(?,'%') 
                  OR items.itemcallnumber is NULL
                  OR items.itemcallnumber = '')";
-        @loopcriteria = ("AA".."zz", "") unless (scalar(@loopcriteria)>0);  
+
+        @loopcriteria = ("AA".."ZZ", "") unless (scalar(@loopcriteria)>0);  
     }else {
         $str .= "AND biblio.title LIKE CONCAT(?,'%') ";
         @loopcriteria = ("A".."z") unless (scalar(@loopcriteria)>0);  

diff --git a/catalogue/recentacquisitions.pl b/catalogue/recentacquisitions.pl
index c0cc790..7adbbb7 100755 (executable)
--- a/catalogue/recentacquisitions.pl
+++ b/catalogue/recentacquisitions.pl
@@ -29,7 +29,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $op = $query->param('op');
+my $op = $query->param('op') || '';
 if ($op eq "show_list"){
 
     my $datebegin           = C4::Dates->new($query->param('datebegin'));

diff --git a/opac/opac-recentacquisitions.pl b/opac/opac-recentacquisitions.pl
index 39d45f6..d721cdf 100755 (executable)
--- a/opac/opac-recentacquisitions.pl
+++ b/opac/opac-recentacquisitions.pl
@@ -31,7 +31,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 die() unless C4::Context->preference("OpacRecentAcquisitions");
 
-my $op = $query->param('op');
+my $op = $query->param('op') || '';
 if ($op eq "show_list"){
 
     my $datebegin           = C4::Dates->new($query->param('datebegin'));