Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 26323: Retrieve the correct values for LOST, DAMAGED, LOC and CCODE

Browse source 
Same as previously

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2020-09-03 15:59:22 +02:00
parent 5da1e809b7
commit 1e502efa0a
21 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
View file

@ -4,4 +4,4 @@
[%- USE AuthorisedValues -%]
[%- SET biblio = item.biblio -%]
[%- SET biblioitem = item.biblioitem -%]
"[% biblio.title | html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]", "[% biblioitem.publishercode | html %]", "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]", "[% item.barcode | html %]", "[% item.itemcallnumber | html %]", "[% Branches.GetName(item.homebranch) | html %]", "[% Branches.GetName(item.holdingbranch) | html %]", "[% AuthorisedValues.GetDescriptionByKohaField(frameworkcode => biblio.frameworkcode, kohafield => 'items.location', authorised_value => item.location) | html %]", "[% ItemTypes.GetDescription(item.itype) | html %]", "[% item.stocknumber | html %]", "[% AuthorisedValues.GetDescriptionByKohaField(frameworkcode => biblio.frameworkcode, kohafield => 'items.notforloan', authorised_value => item.notforloan) | html %]","[% AuthorisedValues.GetByCode( 'LOST', item.itemlost ) || "" | html %]","[% AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn ) || "" | html %]", "[% (item.issues || 0) | html %]"
"[% biblio.title | html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]", "[% biblioitem.publishercode | html %]", "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]", "[% item.barcode | html %]", "[% item.itemcallnumber | html %]", "[% Branches.GetName(item.homebranch) | html %]", "[% Branches.GetName(item.holdingbranch) | html %]", "[% AuthorisedValues.GetDescriptionByKohaField(frameworkcode => biblio.frameworkcode, kohafield => 'items.location', authorised_value => item.location) | html %]", "[% ItemTypes.GetDescription(item.itype) | html %]", "[% item.stocknumber | html %]", "[% AuthorisedValues.GetDescriptionByKohaField(frameworkcode => biblio.frameworkcode, kohafield => 'items.notforloan', authorised_value => item.notforloan) | html %]","[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) || "" | html %]","[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) || "" | html %]", "[% (item.issues || 0) | html %]"

6
koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
View file

@ -14,7 +14,7 @@
[%~ END %]",
"[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]",
"[% biblioitem.publishercode | html | $To %]",
"[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]",
"[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]",
"[% FILTER escape_quotes ~%]
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]#item[% item.itemnumber | uri %]" title="Go to item details">[% item.barcode | html %]</a>
[%~ END %]",
@ -25,8 +25,8 @@
"[% ItemTypes.GetDescription(item.itype) | html %]",
"[% item.stocknumber | html %]",
"[% AuthorisedValues.GetDescriptionByKohaField( frameworkcode => biblio.frameworkcode, kohafield => 'items.notforloan', authorised_value => item.notforloan) | html %]",
"[% AuthorisedValues.GetByCode( 'LOST', item.itemlost ) || "" | html %]",
"[% AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn ) || "" | html %]",
"[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) || "" | html %]",
"[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) || "" | html %]",
"[% (item.issues || 0) | html %]",
"[% FILTER escape_quotes ~%]
<div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu pull-right"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
View file

@ -34,7 +34,7 @@
[% url = BLOCK %][% url | $raw %][% "&count=" _ results_per_page | url %][% END %]
[% END %]
[% FOREACH facet IN facets_loo.facets %]
[% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
[% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => facet.facet_label_value,0) || facet.facet_label_value %][% END %]
[% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
[% IF loop.count > 5 && !facet.active %]
<li class="collapsible-facet" style="display:none">

2
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
View file

@ -39,7 +39,7 @@
</td>
<td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td>
<td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %]</td>
<td>[% AuthorisedValues.GetByCode('LOC', reserveloo.item.location) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => reserveloo.item.location) | html %]</td>
<td>[% reserveloo.item.itemcallnumber | html %]</td>
<td>[% reserveloo.item.copynumber | html %]</td>
<td>[% reserveloo.item.enumchron | html %]</td>

2
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
View file

@ -630,7 +630,7 @@ Note that permanent location is a code, and location may be an authval.
<h3>At library: [% Branches.GetName(subscription.branchcode) || subscription.branchcode | html %]</h3>
[% END %]
[% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
[% IF ( subscription.location ) %]<p class="subscription_location">Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location ) | html %]</p>[% END %]
[% IF ( subscription.location ) %]<p class="subscription_location">Location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</p>[% END %]
[% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber | html %] </p>[% END %]
[% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
[% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
View file

@ -611,13 +611,13 @@
[<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% other_items_loo.itemcallnumber |uri %]%22">[% other_items_loo.itemcallnumber | html %]</a>]
[% END %]
[% IF ( other_items_loo.withdrawn ) %]
([% AuthorisedValues.GetByCode( 'WITHDRAWN', other_items_loo.withdrawn ) | html %])
([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => other_items_loo.withdrawn ) | html %])
[% END %]
[% IF ( other_items_loo.itemlost ) %]
([% AuthorisedValues.GetByCode( 'LOST', other_items_loo.itemlost ) | html %])
([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => other_items_loo.itemlost ) | html %])
[% END %]
[% IF ( other_items_loo.damaged ) %]
([% AuthorisedValues.GetByCode( 'DAMAGED', other_items_loo.damaged ) | html %])
([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => other_items_loo.damaged ) | html %])
[% END %]
[% IF ( other_items_loo.intransit ) %]
(In transit)

8
koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
View file

@ -175,11 +175,11 @@
[% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %]
[% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %]
</td>
<td class="ar-collection">[% AuthorisedValues.GetByCode( 'CCODE', ar.item.ccode ) | html %]</td>
<td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td>
<td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td>
<td class="ar-callnumber">
[% IF ar.item.location %]
<em>[% AuthorisedValues.GetByCode( 'LOC', ar.item.location ) | html %]</em>
<em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em>
[% END %]
[% ar.item.itemcallnumber | html %]
@ -282,11 +282,11 @@
[% IF ar.chapters %] <p><strong>Chapters:</strong> [% ar.chapters | html %] </p> [% END %]
[% IF ar.patron_notes %] <p><strong>Patron notes:</strong> [% ar.patron_notes | html %] </p> [% END %]
</td>
<td class="ar-collection">[% AuthorisedValues.GetByCode( 'CCODE', ar.item.ccode ) | html %]</td>
<td class="ar-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ar.item.ccode ) | html %]</td>
<td class="ar-itemtype">[% ItemTypes.GetDescription( ar.item.effective_itemtype ) | html %]</td>
<td class="ar-callnumber">
[% IF ar.item.location %]
<em>[% AuthorisedValues.GetByCode( 'LOC', ar.item.location ) | html %]</em>
<em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]</em>
[% END %]
[% ar.item.itemcallnumber | html %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
View file

@ -203,10 +203,10 @@
</td>
<td class="tf-author">[% trsfitemloo.item.biblio.author | html %]</td>
<td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.item.biblionumber | uri %]&amp;itemnumber=[% trsfitemloo.item.itemnumber | uri %]#item[% trsfitemloo.item.itemnumber | uri %]">[% trsfitemloo.item.barcode | html %]</a></td>
<td class="tf-location"><span class="shelvingloc">[% AuthorisedValues.GetByCode( 'LOC', trsfitemloo.item.location ) | html %]</span></td>
<td class="tf-location"><span class="shelvingloc">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => trsfitemloo.item.location ) | html %]</span></td>
<td class="tf-itemcallnumber">[% trsfitemloo.item.itemcallnumber | html %]</td>
<td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.item.effective_itemtype ) | html %]</td>
<td class="tf-ccode">[% AuthorisedValues.GetByCode( 'CCODE', trsfitemloo.item.ccode ) | html %]</td>
<td class="tf-ccode">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => trsfitemloo.item.ccode ) | html %]</td>
<td class="tf-origin">[% Branches.GetName( trsfitemloo.frombrcd ) | html %]</td>
<td class="tf-destination">[% Branches.GetName( trsfitemloo.tobrcd ) | html %]</td>
</tr>

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
View file

@ -55,7 +55,7 @@
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a>
</td>
<td>[% Branches.GetName(item.branchcode) | html %]</td>
<td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]</td>
</tr>
[% END %]
</tbody>

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
View file

@ -141,7 +141,7 @@
</td>
<td>
[% FOREACH loc IN reserveloo.locations %]
[% AuthorisedValues.GetByCode('LOC', loc) | html %]
[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => loc) | html %]
[% END %]
</td>
<td>

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
View file

@ -76,7 +76,7 @@
<td>
<ul>
[% FOREACH location IN reserveloo.location %]
<li>[% AuthorisedValues.GetByCode( 'LOC', location ) | html %]</li>
<li>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => location ) | html %]</li>
[% END %]
</ul>
</td>

12
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
View file

@ -214,24 +214,26 @@
Item shelving location updated.
<br />Old value:
[% IF errmsgloo.ItemLocationUpdated.from %]
[% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => errmsgloo.ItemLocationUpdated.from ) %]
[% IF errmsgloo.ItemLocationUpdated.from == '' %]
empty
[% ELSIF AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.from ) == '' %]
[% ELSIF av_description == '' %]
[% errmsgloo.ItemLocationUpdated.from | html %] (No description available)
[% ELSE %]
[% AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.from ) | html %]
[% av_description | html %]
[% END %]
[% ELSE %]
"Blank"
[% END %]
<br />New value:
[% IF errmsgloo.ItemLocationUpdated.to %]
[% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => errmsgloo.ItemLocationUpdated.to ) %]
[% IF errmsgloo.ItemLocationUpdated.to == '' %]
empty
[% ELSIF AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.to ) == '' %]
[% ELSIF av_description == '' %]
[% errmsgloo.ItemLocationUpdated.to | html %] (Not an authorized value)
[% ELSE %]
[% AuthorisedValues.GetByCode( 'LOC', errmsgloo.ItemLocationUpdated.to ) | html %]
[% av_description | html %]
[% END %]
[% ELSE %]
"Blank"
@ -848,7 +850,7 @@
[% ItemTypes.GetDescription( riloo.itemtype ) | html %]
</td>
<td class="ci-collection">
[% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => riloo.ccode) | html %]
</td>
<td class="ci-patron">
[% IF ( riloo.duedate ) %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
View file

@ -149,9 +149,9 @@
</div>
</p>
</td>
<td class="hq-collection">[% AuthorisedValues.GetByCode( 'CCODE', itemsloo.ccode ) | html %]</td>
<td class="hq-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemsloo.ccode ) | html %]</td>
<td class="hq-itemtype">[% ItemTypes.GetDescription( itemsloo.itype ) | html %]</td>
<td class="hq-callnumber">[% IF ( itemsloo.location ) %]<em>[% AuthorisedValues.GetByCode( 'LOC', itemsloo.location ) | html %]</em> [% END %][% itemsloo.itemcallnumber | html %]</td>
<td class="hq-callnumber">[% IF ( itemsloo.location ) %]<em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => 'itemsloo.location ) | html %]</em> [% END %][% itemsloo.itemcallnumber | html %]</td>
<td class="hq-copynumber">[% itemsloo.copynumber | html %]</td>
<td class="hq-enumchron">[% itemsloo.enumchron | html %]</td>
<td class="hq-barcode">

4
koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
View file

@ -105,9 +105,9 @@
<td>[% item.replacementprice | $Price %]</td>
<td>[% Branches.GetName(item.homebranch) | html %]</td>
<td>[% ItemTypes.GetDescription(item.effective_itemtype) | html %]</td>
<td>[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]</td>
<td>[% Branches.GetName(item.holdingbranch) | html %]</td>
<td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) | html %]
<td>[% item.itemnotes | $raw %]</td>
</tr>

8
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View file

@ -609,7 +609,7 @@
</td>
[% IF itemdata_ccode %]
<td>
[% IF ( itemloo.ccode ) %][% AuthorisedValues.GetByCode( 'CCODE', itemloo.ccode ) | html %][% END %]
[% IF ( itemloo.ccode ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemloo.ccode ) | html %][% END %]
</td>
[% END %]
<td>
@ -665,15 +665,15 @@
[% END %]
[% IF ( itemloo.itemlost ) %]
<span class="lost">[% AuthorisedValues.GetByCode( 'LOST', itemloo.itemlost ) | html %]</span>
<span class="lost">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => itemloo.itemlost ) | html %]</span>
[% END %]
[% IF ( itemloo.damaged ) %]
<span class="dmg">[% AuthorisedValues.GetByCode( 'DAMAGED', itemloo.damaged ) | html %]</span>
<span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => itemloo.damaged ) | html %]</span>
[% END %]
[% IF ( itemloo.withdrawn ) %]
<span class="wdn">[% AuthorisedValues.GetByCode( 'WITHDRAWN', itemloo.withdrawn ) | html %]</span>
<span class="wdn">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => itemloo.withdrawn ) | html %]</span>
[% END %]
[% IF ( itemloo.notforloan ) %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
View file

@ -109,7 +109,7 @@
[% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) | html %][% END %]
</td>
<td>
[% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) | html %][% END %]
[% IF ( subscription.location ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %][% END %]
</td>
<td>
[% IF ( subscription.callnumber ) %][% subscription.callnumber | html %][% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
View file

@ -50,7 +50,7 @@
<td>[% subscription.biblio.biblioitem.issn | html %]</td>
<td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
<td>[% AuthorisedValues.GetByCode('LOC', subscription.location) | html %]</td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td>
<td>[% Branches.GetName(subscription.branchcode) | html %]</td>
<td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
<td>[% subscription.notes | html %]</td>

6
koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
View file

@ -8,7 +8,7 @@
[% IF ( item.itemlost ) %]
[% SET itemavailable = 0 %]
[% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %]
[% av_lib_include = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost, opac => 1 ) %]
[% IF ( av_lib_include ) %]
<span class="item-status lost">[% av_lib_include | html %]</span>
[% ELSE %]
@ -53,7 +53,7 @@
[% IF ( item.withdrawn ) %]
[% SET itemavailable = 0 %]
[% av_lib_include = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn, 1 ) %]
[% av_lib_include = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn, opac => 1 ) %]
[% IF av_lib_include %]
<span class="item-status withdrawn">[% av_lib_include | html %]</span>
[% ELSE %]
@ -76,7 +76,7 @@
[% IF ( item.damaged ) %]
[% SET itemavailable = 0 %]
[% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) %]
[% av_lib_include = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => item.damaged, opac => 1 ) %]
[% IF av_lib_include %]
<span class="item-status damaged">[% av_lib_include | html %]</span>
[% ELSE %]

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
View file

@ -43,7 +43,7 @@
[% url = BLOCK %][% url | $raw %][% "&amp;count=" _ results_per_page | url %][% END %]
[% END %]
[% FOREACH facet IN facets_loo.facets %]
[% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,1) || facet.facet_label_value %][% END %]
[% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => facet.facet_label_value, opac =>1 ) || facet.facet_label_value %][% END %]
[% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
[% IF loop.count > 5 && !facet.active %]
<li class="collapsible-facet" style="display:none">

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
View file

@ -81,8 +81,8 @@
<td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title-head.inc' biblio=cr.biblio %]</a></td>
<td>[% cr.biblio.author | html %]</td>
<td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
<td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <em>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]</em></td>
<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %]</td>
<td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => cr.item.location, opac => 1 ) | html %]</em></td>
<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => cr.item.ccode, opac => 1 ) | html %]</td>
<td>[% cr.item.itemcallnumber | html %]</td>
<td>[% cr.item.copynumber | html %]</td>
<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View file

@ -396,7 +396,7 @@
<td class="holdingbranch">[% Branches.GetName( itemLoo.holdingBranchName ) | html %]</td>
[% END %]
[% IF ( itemdata_ccode ) %]
<td class="ccode"> [% IF ( itemLoo.ccode ) %][% AuthorisedValues.GetByCode( 'CCODE', itemLoo.ccode, 1 ) | html %][% END %]</td>
<td class="ccode"> [% IF ( itemLoo.ccode ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemLoo.ccode, opac => 1 ) | html %][% END %]</td>
[% END %]
<td class="call_no">[% itemLoo.callNumber | html %]</td>
[% IF ( itemdata_enumchron ) %]