Merge remote-tracking branch 'origin/new/bug_8520'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / returns.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt

index 835724f..674cf86 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -1,4 +1,6 @@
  [% USE KohaDates %]
+[% USE KohaBranchName %]
+
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
  [% INCLUDE 'doc-head-close.inc' %]
@@ -45,10 +47,9 @@ $(document).ready(function () {
  </script>
  </head>
  <body id="circ_returns" class="circ">
-<div id="header" class="gradient">
+
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'checkin-search.inc' %]
-</div>
  
  <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
  
@@ -91,7 +92,7 @@ $(document).ready(function () {
  </div>
  [% END %]
  <!-- case of a mistake in transfer loop -->
-[% IF ( WrongTransfer ) %]<div id="return2" 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><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
+[% IF ( WrongTransfer ) %]<div id="return2" 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 | $KohaBranchName %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> 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>
@@ -427,7 +428,7 @@ $(document).ready(function () {
  [% IF ( riloop ) %]
      <h2>Checked-in items</h2>
      <table>
-    <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>
+    <tr><th>Due date</th><th>Title</th>        <th>Author</th> <th>Barcode</th><th>Home branch</th><th>Holding branch</th><th>Shelving location</th><th>Call number</th><th>Type</th>  <th>Patron</th><th>Note</th></tr>
  
          [% FOREACH riloo IN riloop %]
              <tr>
@@ -443,6 +444,8 @@ $(document).ready(function () {
                      [% 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.homebranch %]</td>
+            <td>[% riloo.holdingbranch %]</td>
              <td>[% riloo.location %]</td>
              <td>[% riloo.itemcallnumber %]</td>
              <td>[% riloo.itemtype %] [% riloo.ccode %]</td>