[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/reserve/re... [rel_3_0]

[Bruno Toumi]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Bruno Toumi <btoumi>    06/12/20 16:30:40

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl 
        reserve        : request.pl 

Log message:
        adding a security, if the document is in transfert, no possibitlity to 
cancel an item reservation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.15&r2=1.3.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.13&r2=1.6.2.14

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.3.2.15
retrieving revision 1.3.2.16
diff -u -b -r1.3.2.15 -r1.3.2.16
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl        19 Dec 2006 
17:06:20 -0000      1.3.2.15
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl        20 Dec 2006 
16:30:39 -0000      1.3.2.16
@@ -3,7 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
 <script language="JavaScript">
 function check() {
        var msg = "";
@@ -51,7 +50,16 @@
        }
 }
 </script>
-
+<!-- TMPL_IF NAME="messagetransfert" -->
+               <div>
+                               <h2>Reserve find for the document(<!-- TMPL_VAR 
NAME="nextreservtitle" -->)must transfered</h2>
+                       <p>This documen is reserved by : <b> <!-- TMPL_VAR 
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> 
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this 
document in transfer .
+                       </p>
+                       <form name="cancelReservewithtransfert" 
action="branchreserves.pl" method="post">
+                               <input type="submit" class="button circulation">
+                       </form>
+               </div>
+       <!-- /TMPL_IF -->
 <h1>Request for reserve</h1>
 
 <fieldset>
@@ -222,6 +230,9 @@
         </td>
         <td>
         <!-- TMPL_IF NAME="reservedate"-->
+               <!-- TMPL_IF NAME="nocancel" -->
+                       Can't be cancelled, when item on transfert
+                       <!-- TMPL_ELSE -->
                <a class="info" href="modrequest.pl?CancelBiblioNumber=<!-- 
TMPL_VAR NAME="biblionumber" -->&CancelBorrowerNumber=<!-- TMPL_VAR 
NAME="ReservedForBorrowernumber" -->&CancelItemnumber=<!--  TMPL_VAR 
NAME="itemnumber"-->"  onclick="if (window.confirm('You will delete a reserve, 
are you sure ?'))    
                                    {return true;}
                 else {return false;}">Cancel A reserve
@@ -229,6 +240,7 @@
                        <!-- TMPL_VAR NAME="ReservedForSurname" -->  <!-- 
TMPL_VAR NAME="ReservedForFirstname" -->
                 </span>
                 </a>
+               <!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
                No reserves
         <!-- /TMPL_IF -->

Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -u -b -r1.6.2.13 -r1.6.2.14
--- reserve/request.pl  14 Dec 2006 15:41:55 -0000      1.6.2.13
+++ reserve/request.pl  20 Dec 2006 16:30:40 -0000      1.6.2.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.6.2.13 2006/12/14 15:41:55 toins Exp $
+# $Id: request.pl,v 1.6.2.14 2006/12/20 16:30:40 btoumi Exp $
 
 #writen 2/1/00 by address@hidden
 # Copyright 2000-2002 Katipo Communications
@@ -299,6 +299,7 @@
             $item->{transfertfrom} =
               $branchinfos_of->{$transfertfrom}{branchname};
             $item->{transfertto} = $branchinfos_of->{$transfertto}{branchname};
+               $item->{nocancel} = 1;
         }
 
         # If there is no loan, return and transfer, we show a checkbox.