@@ -, +, @@
---
circ/returns.pl | 1 +
.../prog/en/modules/catalogue/moredetail.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 8 ++++----
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++-
4 files changed, 8 insertions(+), 6 deletions(-)
--- a/circ/returns.pl
+++ a/circ/returns.pl
@@ -572,6 +572,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
$ri{itemcallnumber} = $biblio->{'itemcallnumber'};
$ri{itemtype} = $biblio->{'itemtype'};
$ri{itemnote} = $biblio->{'itemnotes'};
+ $ri{nonpublicnote} = $biblio->{'nonpublicnote'};
$ri{ccode} = $biblio->{'ccode'};
$ri{itemnumber} = $biblio->{'itemnumber'};
$ri{barcode} = $bar_code;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -173,7 +173,7 @@
[% IF ( ITEM_DAT.card1 ) %]
Public Note:
[% IF ( CAN_user_editcatalogue_edit_items ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -702,7 +702,7 @@ No patron matched [% message %]
[% IF ( todayissue.od ) %][% ELSE %] | [% END %]
[% todayissue.dd %]
|
- [% todayissue.title |html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %] |
+ [% todayissue.title |html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %] |
[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %] |
[% todayissue.checkoutdate %] |
[% IF ( todayissue.multiple_borrowers ) %][% todayissue.borrowername %] | [% END %]
@@ -774,7 +774,7 @@ No patron matched [% message %]
[% IF ( previssue.od ) %][% ELSE %] | [% END %]
[% previssue.dd %]
|
- [% previssue.title |html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %] |
+ [% previssue.title |html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %] |
[% previssue.itemtype %]
|
@@ -880,7 +880,7 @@ No patron matched [% message %]
[% END %]
[% IF ( relissue.overdue ) %][% ELSE %] | [% END %]
[% relissue.dd %] |
- [% relissue.title |html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %] |
+ [% relissue.title |html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %] |
[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %] |
[% relissue.displaydate %] |
[% relissue.itemcallnumber %] |
@@ -900,7 +900,7 @@ No patron matched [% message %]
[% IF ( relprevissue.overdue ) %][% ELSE %] | [% END %]
[% relprevissue.dd %]
|
- [% relprevissue.title |html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %] |
+ [% relprevissue.title |html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %] |
[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %] |
[% relprevissue.displaydate %] |
[% relprevissue.itemcallnumber %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -420,7 +420,8 @@ function Dopop(link) {
[% ELSE %]Not checked out[% END %]
[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %]
- [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %]
+ [% IF ( riloo.itemnote ) %][% riloo.itemnote %] [% END %]
+ [% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %]
|
[% END %]
--