Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

(MT 3035) subscription created expired

Browse source 
Subscription expiration date was not calculated on creation of a subscription
(cherry picked from commit 263e9217c8cd736924f66d699981949e29b4c200)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
This commit is contained in:
Henri-Damien LAURENT 2010-02-23 08:56:27 +01:00 committed by Colin Campbell
parent 34673bf4ef
commit 04dbd152f8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
C4/Serials.pm
View file

@ -909,7 +909,7 @@ sub GetSeq {
=head2 GetExpirationDate
$sensddate = GetExpirationDate($subscriptionid, [$startdate])
$enddate = GetExpirationDate($subscriptionid, [$startdate])
this function return the next expiration date for a subscription given on input args.
@ -1252,8 +1252,18 @@ sub NewSubscription {
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate
);
#then create the 1st waited number
my $subscriptionid = $dbh->{'mysql_insertid'};
unless ($enddate){
$enddate = GetExpirationDate($subscriptionid,$startdate);
$query = q|
UPDATE subscription
SET enddate=?
WHERE subscriptionid=?
|;
$sth = $dbh->prepare($query);
$sth->execute( $enddate, $subscriptionid );
}
#then create the 1st waited number
$query = qq(
INSERT INTO subscriptionhistory
(biblionumber, subscriptionid, histstartdate, opacnote, librariannote)
@ -1604,7 +1614,7 @@ sub HasSubscriptionExpired {
my $dbh = C4::Context->dbh;
my $subscription = GetSubscription($subscriptionid);
if ( ( $subscription->{periodicity} % 16 ) > 0 ) {
my $expirationdate = $subscription->{enddate};
my $expirationdate = $subscription->{enddate} || GetExpirationDate($subscriptionid);
if (!defined $expirationdate) {
$expirationdate = q{};
}