#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Koha;
-use C4::Dates qw/format_date/;
use C4::Serials;
use C4::Letters;
use C4::Output;
use C4::Context;
+
+use Koha::DateUtils qw( dt_from_string );
+
use List::MoreUtils qw/uniq/;
my $query = new CGI;
my $op = $query->param('op') || q{};
my $nbissues=$query->param('nbissues');
+my $date_received_today = $query->param('date_received_today') || 0;
my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie)
debug => 1,
});
my $biblionumber = $query->param('biblionumber');
-my @subscriptionid = $query->param('subscriptionid');
+my @subscriptionid = $query->multi_param('subscriptionid');
@subscriptionid= uniq @subscriptionid;
@subscriptionid= sort @subscriptionid;
if($op eq 'gennext' && @subscriptionid){
my $subscriptionid = $subscriptionid[0];
- my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate
- FROM serial WHERE status = 1 AND subscriptionid = ?");
+ my $sth = $dbh->prepare("
+ SELECT publisheddate, publisheddatetext, serialid, serialseq,
+ planneddate
+ FROM serial
+ WHERE status = 1 AND subscriptionid = ?
+ ");
my $status = defined( $nbissues ) ? 2 : 3;
$nbissues ||= 1;
for ( my $i = 0; $i < $nbissues; $i++ ){
$sth->execute($subscriptionid);
# modify actual expected issue, to generate the next
if ( my $issue = $sth->fetchrow_hashref ) {
+ my $planneddate = $date_received_today ? dt_from_string : $issue->{planneddate};
ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
- $issue->{planneddate}, $issue->{publisheddate},
- $status, "" );
+ $planneddate, $issue->{publisheddate},
+ $issue->{publisheddatetext}, $status, "" );
} else {
require C4::Serials::Numberpattern;
my $subscription = GetSubscription($subscriptionid);
## We generate the next publication date
my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);
+ my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
## Creating the new issue
NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
- 1, $nextpublisheddate, $nextpublisheddate );
+ 1, $planneddate, $nextpublisheddate );
## Updating the subscription seq status
my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
$subs->{opacnote} =~ s/\n/\<br\/\>/g;
$subs->{missinglist} =~ s/\n/\<br\/\>/g;
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+
##these are display information
- $subs->{startdate} = format_date( $subs->{startdate} );
- $subs->{histstartdate} = format_date( $subs->{histstartdate} );
- if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
- $subs->{enddate} = '';
- }
- else {
- $subs->{enddate} = format_date( $subs->{enddate} );
- }
$subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'});
$subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'});
$subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ?
- $location = GetAuthorisedValues('LOC', $subs->{'location'});
+ $location = $subs->{'location'};
$callnumber = $subs->{callnumber};
my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
$subscriptions=PrepareSerialsData(\@subscriptioninformation);
$subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
} else {
- $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber) ;
+ $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber);
+ foreach my $s (@$subscriptiondescs) {
+ my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($s->{periodicity});
+ my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($s->{numberpattern});
+ $s->{frequency} = $frequency;
+ $s->{numberpattern} = $numberpattern;
+ }
my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
$subscriptions=PrepareSerialsData($subscriptioninformation);
}
foreach my $subscription (@$subscriptiondescs){
$subscriptionidlist.=$subscription->{'subscriptionid'}."," ;
$biblionumber = $subscription->{'bibnum'} unless ($biblionumber);
+ $subscription->{'hasRouting'} = check_routing($subscription->{'subscriptionid'});
}
-# warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions);
-# use Data::Dumper; warn Dumper($subscriptions);
-my $locationlib;
-foreach (@$location) {
- $locationlib = $_->{'lib'} if $_->{'selected'};
-}
-
-
chop $subscriptionidlist;
$template->param(
subscriptionidlist => $subscriptionidlist,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
routing => C4::Context->preference("RoutingSerials"),
- subscr=>$query->param('subscriptionid'),
+ subscr=>scalar $query->param('subscriptionid'),
subscriptioncount => $subscriptioncount,
- location => $locationlib,
+ location => $location,
callnumber => $callnumber,
uc(C4::Context->preference("marcflavour")) => 1,
serialsadditems => $subscriptiondescs->[0]{'serialsadditems'},