Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / catalogue / detail.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index fffe411..8903ce1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -328,7 +328,7 @@ function verify_images() {
                     [% IF ( itemloo.waitingdate ) %]
                         Waiting
                     [% ELSE %]
-                        On hold
+                        Item-level hold
                     [% END %]
                     [% IF ( canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">
                        [% IF ( hidepatronname ) %]
@@ -338,12 +338,12 @@ function verify_images() {
                        [% END %]
                    </a>[% END %]
                     [% IF ( itemloo.waitingdate ) %]
-                        at[% ELSE %]expected at
+                        at[% ELSE %]for delivery at
                     [% END %]   [% itemloo.ExpectedAtLibrary %]
-                    since
-                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %]
+                    [% IF ( itemloo.waitingdate ) %]
+                        since [% itemloo.waitingdate %]
                     [% ELSE %]
-                        [% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %]
+                        [% IF ( itemloo.reservedate ) %](placed [% itemloo.reservedate %])[% END %]
                     [% END %]
                 [% END %]
                 [% UNLESS ( itemloo.itemnotforloan ) %][% UNLESS ( itemloo.onloan ) %][% UNLESS ( itemloo.itemlost ) %][% UNLESS ( itemloo.wthdrawn ) %][% UNLESS ( itemloo.damaged ) %][% UNLESS ( itemloo.transfertwhen ) %][% UNLESS ( itemloo.reservedate ) %]
@@ -355,7 +355,7 @@ function verify_images() {
                     </td>
                     <td class="datelastseen">[% itemloo.datelastseen %]</td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% itemloo.type %]&amp;itemnumber=[% itemloo.itemnumber %]&amp;biblionumber=[% itemloo.biblionumber %]&amp;bi=[% itemloo.biblioitemnumber %]#item[% itemloo.itemnumber %]">[% itemloo.barcode %]</a></td>
-                               [% IF ( itemloo.enumchron ) %]  <td class="enumchron">
+                               [% IF ( volinfo ) %]    <td class="enumchron">
                                        [% IF ( itemdata_enumchron ) %]
                                                [% IF ( itemloo.enumchron ) %]
                                                [% itemloo.enumchron %][% IF ( itemloo.serialseq ) %] -- [% END %]
@@ -370,9 +370,6 @@ function verify_images() {
                                        <td class="copynumber">[% itemloo.copynumber %]</td>
                                [% END %]
                 [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
-                [% IF ( itemloo.type ) %]
-                    <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% itemloo.biblioitemnumber %]&amp;item=[% itemloo.itemtype %]">Fix Itemtype</a></td>
-                [% END %]
                [% IF ( SpineLabelShowPrintOnBibDetails ) %]
                        <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
                [% END %]