Merge commit 'kc/master'

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

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 93aa00b..23e2abc 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -13,12 +13,13 @@
 # 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;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -30,18 +31,16 @@ use C4::Context;
 
 
 my $query = new CGI;
-my $op = $query->param('op');
+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');
@@ -50,32 +49,42 @@ my @subscriptionid = $query->param('subscriptionid');
 my $subscriptiondescs ;
 my $subscriptions;
 
-if($op eq "gennext" && @subscriptionid){
-    my $subscriptionid = @subscriptionid[0];
+if($op eq 'gennext' && @subscriptionid){
+    my $subscriptionid = $subscriptionid[0];
     my $subscription = GetSubscription($subscriptionid);
 
-    my $expected = GetNextExpected($subscriptionid);
-    
-    my (
-            $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
-            $newinnerloop1, $newinnerloop2, $newinnerloop3
-        ) = GetNextSeq($subscription);
-
-    ## 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 = ?";
-    $sth = $dbh->prepare($squery);
-    $sth->execute(
-        $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1,
-        $newinnerloop2, $newinnerloop3, $subscriptionid
-        );
+       my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate
+                                                       FROM serial WHERE status = 1 AND subscriptionid = ?");
+       $sth->execute($subscriptionid);
+
+       # modify actual expected issue, to generate the next
+       if ( my $issue = $sth->fetchrow_hashref ) {
+               ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
+                $issue->{planneddate}, $issue->{publisheddate},
+                3, "" );
+       }else{
+               my $expected = GetNextExpected($subscriptionid);
+           my (
+                $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
+             $newinnerloop1, $newinnerloop2, $newinnerloop3
+            ) = GetNextSeq($subscription);
+
+            ## 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 = ?";
+            $sth = $dbh->prepare($squery);
+            $sth->execute(
+                $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1,
+                $newinnerloop2, $newinnerloop3, $subscriptionid
+                );
+
+       }
 
     print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
 }
@@ -93,7 +102,7 @@ if (@subscriptionid){
     $subs->{ "status" . $subs->{'status'} } = 1;
     $subs->{startdate}     = format_date( $subs->{startdate} );
     $subs->{histstartdate} = format_date( $subs->{histstartdate} );
-    if ( $subs->{enddate} eq '0000-00-00' ) {
+    if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
         $subs->{enddate} = '';
     }
     else {