bug fixing : 1459 + fixing a jserror in basket.tmpl

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 8363ea8..e05dcfc 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -690,10 +690,10 @@ sub CanBookBeIssued {
     if ( $borrower->{'dateexpiry'} eq '0000-00-00') {
         $issuingimpossible{EXPIRED} = 1;
     } else {
-        if ( Date_to_Days(Today) > 
-            Date_to_Days( split "-", $borrower->{'dateexpiry'} ) )
-        {
-            $issuingimpossible{EXPIRED} = 1;
+        my @expirydate=  split /-/,$borrower->{'dateexpiry'};
+        if($expirydate[0]==0 || $expirydate[1]==0|| $expirydate[2]==0 ||
+            Date_to_Days(Today) > Date_to_Days( @expirydate )) {
+            $issuingimpossible{EXPIRED} = 1;                                   
         }
     }
     #

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 22b1310..5806102 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -3,7 +3,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_UNLESS name="closedate" -->
 <script type="text/javascript">
-//<![CDATA[            function confirm_close() {
+//<![CDATA[
+            function confirm_close() {
                 var is_confirmed = confirm('Are you sure you want to close this basket?');
                 if (is_confirmed) {
                     window.location = "/cgi-bin/koha/acqui/booksellers.pl?op=close&basketno=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->";