Bug 7731 [Follow-up] Library should be used instead of branch and site

[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 1ed01f0..a27b45f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -47,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>
  
@@ -89,7 +88,7 @@ $(document).ready(function () {
  
  
  [% IF ( wrongbranch ) %]
-<div class="dialog alert"><h3>Cannot Check In</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>
+<div class="dialog alert"><h3>Cannot check in</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>
  </div>
  [% END %]
  <!-- case of a mistake in transfer loop -->
@@ -335,7 +334,12 @@ $(document).ready(function () {
                          <p class="problem">Item was lost, now found.</p>
                      [% END %]
                      [% IF ( errmsgloo.withdrawn ) %]
-                        <p class="problem">Item is withdrawn.</p>
+                        [% IF BlockReturnOfWithdrawnItems %]
+                           <h3>Cannot Check In</h3>
+                           <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
+                        [% ELSE %]
+                           <p class="problem">Item is withdrawn.</p>
+                        [% END %]
                      [% END %]
                      [% IF ( errmsgloo.debarred ) %]
                          <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p>
@@ -408,28 +412,10 @@ $(document).ready(function () {
      </form>
  </div>
  
-[% IF ( returned ) %]
-<div class="yui-g">    <table>
-        <tr><th>Item information</th><th>Patron information</th></tr>
-        <tr>
-            <td>[% title |html %]</td>
-            <td>
-
-                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riborrowernumber %]">[% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
-                [% IF ( flagset ) %]
-                ([% FOREACH flagloo IN flagloop %]
-                [% flagloo.flag %]
-               [% IF ( flagloo.charges ) %] of [% flagloo.chargeamount %] [% END %]
-               ,
-                [% END %])[% END %]
-            </td>
-        </tr>
-    </table>
-[% END %]
  [% 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 library</th><th>Holding library</th><th>Shelving location</th><th>Call number</th><th>Type</th>        <th>Patron</th><th>Note</th></tr>
  
          [% FOREACH riloo IN riloop %]
              <tr>
@@ -445,6 +431,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>