From 6882a6a9332a722fba30adba7879c07d67d30bcd Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 14 Feb 2018 14:24:59 +0100 Subject: [PATCH] Bug 20194: Display both itemtypes in checkin table And move ccode in its own column Test plan: 1. Check in an item and verify that both itemtypes are displayed in the table --- circ/returns.pl | 3 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 33 ++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index bd30f5cb64..8286c292d4 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -601,7 +601,8 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{itemauthor} = $biblio->author; $ri{itemcallnumber} = $item->itemcallnumber; $ri{dateaccessioned} = $item->dateaccessioned; - $ri{itemtype} = $item->effective_itemtype; + $ri{itemtype} = Koha::ItemTypes->find($item->biblioitem->itemtype); + $ri{itype} = Koha::ItemTypes->find($item->itype); $ri{itemnote} = $item->itemnotes; $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic; $ri{ccode} = $item->ccode; 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 62878d64dd..3f7433b6e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -628,8 +628,25 @@ [% IF ( riloop ) %]

Checked-in items

- - + + + + + + + + + + + + + + + + + + + [% FOREACH riloo IN riloop %] - + + [% END %] +
Due dateTitleAuthorBarcodeHome libraryHolding libraryShelving locationCall numberDate acquiredTypePatronNote
Due dateTitleAuthorBarcodeHome libraryHolding libraryShelving locationCall numberDate acquiredItem typeCollectionPatronNote
[% IF ( riloo.duedate ) %] @@ -655,7 +672,16 @@ [% riloo.location %] [% riloo.itemcallnumber %] [% riloo.dateaccessioned | $KohaDates %][% ItemTypes.GetDescription( riloo.itemtype ) %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) %] + [% IF riloo.itemtype %] + [% riloo.itemtype.translated_description %] +
+ [% END %] + [% IF riloo.itype %] + [% riloo.itype.translated_description %] + [% END %] +
[% AuthorisedValues.GetByCode('CCODE', riloo.ccode) %] [% IF ( riloo.duedate ) %] [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %]) @@ -676,6 +702,7 @@
[% END %] -- 2.14.2