From 5cd5b755cd846b0f4076472321920edc0a93f86e Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 21 Sep 2016 23:09:55 +0000
Subject: [PATCH] Bug 17331 - Show holding branch in holds awaiting pickup
 report
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch adds a holdingbranch column to waitingreseves.tt and
separates 'Location' into Home branch and callnumber columns

To test:
1 - Have some holds waiting and holds over
2 - View the report before the patch
3 - Note that location contains homebranch and call number
4 - View the report after the patch
5 - Note the new columns
6 - Ensure data is correct and no info has been lost

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Fixed 2 capitalization issues.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 98bca8f34b5fb739167d49868b317cbf16922bb1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/circ/waitingreserves.tt      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 4119303b77..8231223b83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -85,7 +85,9 @@
                     <th class="title-string">Available since</th>
                     <th class="anti-the">Title</th>
                     <th>Patron</th>
-                    <th>Location</th>
+                    <th>Home branch</th>
+                    <th>Current location</th>
+                    <th>Call number</th>
                     <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
@@ -104,7 +106,9 @@
                         [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]">
                         [% reserveloo.borrowermail %]</a>[% END %]
                     </td>
-                    <td>[% Branches.GetName( reserveloo.homebranch ) %]<br />[% reserveloo.itemcallnumber %]</td>
+                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
+                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
+                    <td>[% reserveloo.itemcallnumber %]</td>
                     <td>[% reserveloo.copynumber %]</td>
                     <td>[% reserveloo.enumchron %]</td>
                     <td>
@@ -147,7 +151,9 @@
                     <th class="title-string">Available since</th>
                     <th class="anti-the">Title</th>
                     <th>Patron</th>
-                    <th>Location</th>
+                    <th>Home branch</th>
+                    <th>Current location</th>
+                    <th>Call number</th>
                     <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
@@ -165,7 +171,9 @@
                         [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]">
         [% overloo.borrowermail %]</a>[% END %]
                     </td>
-                    <td>[% Branches.GetName( overloo.homebranch ) %] [% overloo.itemcallnumber %]</td>
+                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
+                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
+                    <td>[% overloo.itemcallnumber %]</td>
                     <td>[% overloo.copynumber %]</td>
                     <td>[% overloo.enumchron %]</td>
                     <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
-- 
2.39.5