[Koha-cvs] koha/C4 Serials.pm

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Changes by:     Henri-Damien LAURENT <hdl>      07/06/30 05:26:25

Modified files:
        C4             : Serials.pm 

Log message:
        Changing GetSerials2 to take more than one status in parameter.
        status=1,3
        will display all the serials late and waited.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&r1=1.24&r2=1.25

Patches:
Index: Serials.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Serials.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Serials.pm  27 Jun 2007 22:09:15 -0000      1.24
+++ Serials.pm  30 Jun 2007 05:26:25 -0000      1.25
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Serials.pm,v 1.24 2007/06/27 22:09:15 hdl Exp $
+# $Id: Serials.pm,v 1.25 2007/06/30 05:26:25 hdl Exp $
 
 use strict;
 use C4::Date;
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.24 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.25 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -526,7 +526,7 @@
     if (C4::Context->preference('IndependantBranches') && 
         C4::Context->userenv && 
         C4::Context->userenv->{'flags'} != 1){
-       $query.=" AND subscription.branchcode IN 
('".C4::Context->userenv->{'branch'}."',\"''\")";
+       $query.=" AND subscription.branchcode IN 
('".C4::Context->userenv->{'branch'}."',\"\")";
     }
     my $sth = $dbh->prepare($query);
     $sth->execute($biblionumber);
@@ -793,7 +793,7 @@
     my $query = qq|
                  SELECT   serialid,serialseq, status, planneddate, 
publisheddate,notes
                  FROM     serial 
-                 WHERE    subscriptionid=$subscription AND status=$status 
+                 WHERE    subscriptionid=$subscription AND status IN ($status)
                  ORDER BY publisheddate,serialid DESC
                     |;
 #     warn $query;