Release notes 3.0.6

[koha.git] / C4 / Serials.pm

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 2bc39dc..2f5f27f 100644 (file)
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -588,6 +588,7 @@ sub GetFullSubscriptionsFromBiblionumber {
             aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,
             biblio.title as bibliotitle,
             subscription.branchcode AS branchcode,
+            branches.branchname AS branchname,
             subscription.subscriptionid AS subscriptionid|;
      if (C4::Context->preference('IndependantBranches') && 
         C4::Context->userenv && 
@@ -602,6 +603,7 @@ sub GetFullSubscriptionsFromBiblionumber {
           (serial.subscriptionid=subscription.subscriptionid)
   LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid 
   LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+  LEFT JOIN branches ON branches.branchcode=subscription.branchcode
   LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber 
   WHERE     subscription.biblionumber = ? 
   ORDER BY year DESC,
@@ -1009,7 +1011,9 @@ sub GetExpirationDate {
     my $dbh              = C4::Context->dbh;
     my $subscription     = GetSubscription($subscriptionid);
     my $enddate          = $subscription->{startdate};
-
+    
+    return if not $subscription->{startdate};
+    
 # we don't do the same test if the subscription is based on X numbers or on X weeks/months
     if (($subscription->{periodicity} % 16) >0){
       if ( $subscription->{numberlength} ) {
@@ -2384,6 +2388,7 @@ sub GetNextDate(@) {
     #date supposed to be in ISO.
     
     my ( $year, $month, $day ) = split(/-/, $planneddate);
+    return undef if not check_date($year, $month, $day);
     $month=1 unless ($month);
     $day=1 unless ($day);
     my @resultdate;