Merge commit 'kc/master'

[koha.git] / serials / serials-collection.pl

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index b6ee0e1..23e2abc 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
@@ -34,15 +34,13 @@ my $query = new CGI;
 my $op = $query->param('op') || q{};
 my $dbh = C4::Context->dbh;
 
-my $sth;
-# my $id;
 my ($template, $loggedinuser, $cookie);
 ($template, $loggedinuser, $cookie)
   = get_template_and_user({template_name => "serials/serials-collection.tmpl",
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {serials => 1},
+                            flagsrequired => {serials => 'receive_serials'},
                             debug => 1,
                             });
 my $biblionumber = $query->param('biblionumber');
@@ -55,7 +53,7 @@ if($op eq 'gennext' && @subscriptionid){
     my $subscriptionid = $subscriptionid[0];
     my $subscription = GetSubscription($subscriptionid);
 
-       my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate 
+       my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate
                                                        FROM serial WHERE status = 1 AND subscriptionid = ?");
        $sth->execute($subscriptionid);
 
@@ -63,7 +61,7 @@ if($op eq 'gennext' && @subscriptionid){
        if ( my $issue = $sth->fetchrow_hashref ) {
                ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
                 $issue->{planneddate}, $issue->{publisheddate},
-                3, "Automatically set to late" );
+                3, "" );
        }else{
                my $expected = GetNextExpected($subscriptionid);
            my (
@@ -71,12 +69,12 @@ if($op eq 'gennext' && @subscriptionid){
              $newinnerloop1, $newinnerloop2, $newinnerloop3
             ) = GetNextSeq($subscription);
 
-            ## We generate the next publication date    
+            ## We generate the next publication date
             my $nextpublisheddate = GetNextDate( $expected->{planneddate}->output('iso'), $subscription );
             ## Creating the new issue
             NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
                     1, $nextpublisheddate, $nextpublisheddate );
-             
+
             ## Updating the subscription seq status
             my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
                         WHERE  subscriptionid = ?";