Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster

diff --combined circ/returns.pl
index bb5230b,1996f24..6826d7c
--- 1/circ/returns.pl
--- 2/circ/returns.pl
+++ b/circ/returns.pl
@@@ -3,7 -3,6 +3,7 @@@
  # Copyright 2000-2002 Katipo Communications
  #           2006 SAN-OP
  #           2007-2010 BibLibre, Paul POULAIN
 +#           2010 Catalyst IT
  #
  # This file is part of Koha.
  #
@@@ -172,8 -171,6 +172,8 @@@ my $barcode     = $query->param('barcod
  my $exemptfine  = $query->param('exemptfine');
  my $dropboxmode = $query->param('dropboxmode');
  my $dotransfer  = $query->param('dotransfer');
 +my $canceltransfer = $query->param('canceltransfer');
 +my $dest = $query->param('dest');
  my $calendar    = C4::Calendar->new( branchcode => $userenv_branch );
  #dropbox: get last open day (today - 1)
  my $today       = C4::Dates->new();
@@@ -186,17 -183,6 +186,17 @@@ if ($dotransfer)
      ModItemTransfer($transferitem, $userenv_branch, $tobranch); 
  }
  
 +if ($canceltransfer){
 +    $itemnumber=$query->param('itemnumber');
 +    DeleteTransfer($itemnumber);
 +    if($dest eq "ttr"){
 +        print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
 +        exit;
 +    } else {
 +        $template->param( transfercancelled => 1);
 +    }
 +}
 +
  # actually return book and prepare item table.....
  if ($barcode) {
      $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
@@@ -277,6 -263,8 +277,8 @@@
                  $template->param(
                      waiting_holds       => $waiting_holds,
                      holdsborrowernumber => $borrower->{'borrowernumber'},
+                     holdsfirstname => $borrower->{'firstname'},
+                     holdssurname => $borrower->{'surname'},
                  );
              }
          }
@@@ -335,7 -323,6 +337,7 @@@ if ( $messages->{'WrongTransfer'} and n
          WrongTransfer  => 1,
          TransferWaitingAt => $messages->{'WrongTransfer'},
          WrongTransferItem => $messages->{'WrongTransferItem'},
 +        itemnumber => $itemnumber,
      );
  
      my $reserve    = $messages->{'ResFound'};
@@@ -537,7 -524,6 +539,7 @@@ if ($borrower) 
  my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
  my $count = 0;
  my @riloop;
 +my $shelflocations = GetKohaAuthorisedValues('items.location','');
  foreach ( sort { $a <=> $b } keys %returneditems ) {
      my %ri;
      if ( $count++ < $returned_counter ) {
@@@ -576,11 -562,6 +578,11 @@@
          $ri{ccode}            = $biblio->{'ccode'};
          $ri{itemnumber}       = $biblio->{'itemnumber'};
          $ri{barcode}          = $bar_code;
 +
 +        $ri{location}         = $biblio->{'location'};
 +        my $shelfcode = $ri{'location'};
 +        $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
 +
      }
      else {
          last;

diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index c02be49,4ae2234..25f1746
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@@ -68,9 -68,9 +68,9 @@@ function Dopop(link) 
  
  <!-- Patron has waiting holds -->
  [% IF ( waiting_holds ) %]
-     <div class="dialog alert">
-         <h3>Patron has [% waiting_holds %] hold(s) waiting for pickup.</h3>
-         <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber %]">Checkout holds</a>.</p>
+     <div class="dialog message">
+         <h3>[% holdsfirstname %] [% holdssurname %] has [% waiting_holds %] hold(s) waiting for pickup.</h3>
+         <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber %]">Check out to this patron</a>.</p>
      </div>
  [% END %]
  
@@@ -80,7 -80,7 +80,7 @@@
  </div>
  [% END %]
  <!-- case of a mistake in transfer loop -->
 -[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3>
 +[% IF ( WrongTransfer ) %]<div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %] or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
  [% IF ( wborcnum ) %]<h5>Hold for:</h5>
          <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
              [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
@@@ -396,7 -396,7 +396,7 @@@
  [% IF ( riloop ) %]
      <h2>Checked-In items</h2>
      <table>
 -      <tr><th>Due Date</th><th>Title</th>     <th>Author</th> <th>Barcode</th><th>Call Number</th><th>Type</th>       <th>Patron</th><th>Note</th></tr>
 +      <tr><th>Due Date</th><th>Title</th>     <th>Author</th> <th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th>     <th>Patron</th><th>Note</th></tr>
  
          [% FOREACH riloo IN riloop %]
              <tr>
@@@ -412,7 -412,6 +412,7 @@@
                      [% riloo.itemtitle |html %]</a></td>
                        <td>[% riloo.itemauthor %]</td>
              <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
 +            <td>[% riloo.location %]</td>
              <td>[% riloo.itemcallnumber %]</td>
              <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
                        <td>[% IF ( riloo.duedate ) %]