projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffd8c76)
(MT #3007) update hold transfer slip datas
authorNahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Wed, 10 Mar 2010 21:26:29 +0000 (22:26 +0100)
committerGalen Charlton <gmcharlt@gmail.com>
Fri, 30 Apr 2010 01:42:43 +0000 (21:42 -0400)
This patch add information to hold transfer slip:
 * itemcallnumber
 * location
 * waiting date

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
C4/Reserves.pm patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl patch | blob | history

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 464b3f3..21051a5 100644 (file)
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -1296,23 +1296,41 @@ sub ModReserveMinusPriority {
 sub GetReserveInfo {
        my ( $borrowernumber, $biblionumber ) = @_;
     my $dbh = C4::Context->dbh;
-       my $strsth="SELECT reservedate, reservenotes, reserves.borrowernumber,
-                               reserves.biblionumber, reserves.branchcode,
-                               notificationdate, reminderdate, priority, found,
-                               firstname, surname, phone, 
-                               email, address, address2,
-                               cardnumber, city, zipcode,
-                               biblio.title, biblio.author,
-                               items.holdingbranch, items.itemcallnumber, items.itemnumber, 
-                               barcode, notes
-                       FROM reserves left join items 
-                               ON items.itemnumber=reserves.itemnumber , 
-                               borrowers, biblio 
+       my $strsth="SELECT 
+                      reservedate, 
+                      reservenotes, 
+                      reserves.borrowernumber,
+                                  reserves.biblionumber, 
+                                  reserves.branchcode,
+                                  reserves.waitingdate,
+                                  notificationdate, 
+                                  reminderdate, 
+                                  priority, 
+                                  found,
+                                  firstname, 
+                                  surname, 
+                                  phone, 
+                                  email, 
+                                  address, 
+                                  address2,
+                                  cardnumber, 
+                                  city, 
+                                  zipcode,
+                                  biblio.title, 
+                                  biblio.author,
+                                  items.holdingbranch, 
+                                  items.itemcallnumber, 
+                                  items.itemnumber,
+                                  items.location, 
+                                  barcode, 
+                                  notes
+                       FROM reserves 
+                        LEFT JOIN items USING(itemnumber) 
+                    LEFT JOIN borrowers USING(borrowernumber)
+                    LEFT JOIN biblio ON  (reserves.biblionumber=biblio.biblionumber) 
                        WHERE 
-                               reserves.borrowernumber=?  &&
-                               reserves.biblionumber=? && 
-                               reserves.borrowernumber=borrowers.borrowernumber && 
-                               reserves.biblionumber=biblio.biblionumber ";
+                               reserves.borrowernumber=?
+                               AND reserves.biblionumber=?";
        my $sth = $dbh->prepare($strsth); 
        $sth->execute($borrowernumber,$biblionumber);
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
index 2b82cd8..4b13bef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
@@ -8,7 +8,9 @@ window.close();
 </head>
 <body onload="window.print();">
 <div id="main">
-        <!-- TMPL_LOOP NAME="reservedata" -->
+
+<!-- TMPL_LOOP NAME="reservedata" -->
+
 <h5>Date: <!-- TMPL_VAR NAME="pulldate" --></h5>
 <h3> <!-- TMPL_IF NAME="transferrequired" -->Transfer to <!-- TMPL_VAR Name="branchname" --> <!-- TMPL_ELSE -->Hold in <!-- TMPL_VAR Name="branchname" --><!-- /TMPL_IF --></h3>
 
@@ -18,21 +20,33 @@ window.close();
 
 <ul>
        <li><!-- TMPL_VAR Name="cardnumber" --></li>
-    <li><!-- TMPL_VAR Name="phone" --></li>
-    <li><!-- TMPL_VAR Name="address" --><br />
-         <!-- TMPL_IF Name="address2" --><!-- TMPL_VAR Name="address2" --><br /><!-- /TMPL_IF -->
-      <!-- TMPL_VAR Name="city" -->  <!-- TMPL_VAR NAME="zip" --></li>
-    <!-- TMPL_IF NAME="email" --><li><!-- TMPL_VAR NAME="email" --></li> <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="phone" -->
+        <li><!-- TMPL_VAR Name="phone" --></li>
+    <!-- /TMPL_IF -->
+    <li>
+        <!-- TMPL_VAR Name="address" --><br />
+           <!-- TMPL_IF Name="address2" --><!-- TMPL_VAR Name="address2" --><br /><!-- /TMPL_IF -->
+        <!-- TMPL_VAR Name="city" -->  <!-- TMPL_VAR NAME="zip" -->
+    </li>
+    <!-- TMPL_IF NAME="email" -->
+        <li><!-- TMPL_VAR NAME="email" --></li>
+    <!-- /TMPL_IF -->
 </ul>
 <br />
 <h3>RESERVED ITEM</h3>
  <h4><!-- TMPL_VAR Name="title" escape="html" --></h4>
  <h5><!-- TMPL_VAR NAME="author" --> </h5>
- <p><!-- TMPL_VAR Name="barcode" --></p>
- <!-- TMPL_IF NAME="reservenotes" --><p>Notes: <!-- TMPL_VAR Name="reservenotes" --></p><!-- /TMPL_IF -->
+ <ul>
+    <!-- TMPL_IF NAME="barcode" --><li><!-- TMPL_VAR Name="barcode" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="itemcallnumber" --><li><!-- TMPL_VAR Name="itemcallnumber" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="waitingdate" --><li><!-- TMPL_VAR Name="waitingdate" --></li><!-- /TMPL_IF -->
+ </ul>
+ <!-- TMPL_IF NAME="reservenotes" -->
+    <p>Notes: <!-- TMPL_VAR Name="reservenotes" --></p>
+ <!-- /TMPL_IF -->
 
 
 
-                <!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git