Attachment 110790 Details for Bug 26323 – Bug 26323: Retrieve the correct values for LOST, DAMAGED, LOC and CCODE

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

Bug-26323-Retrieve-the-correct-values-for-LOST-DAM.patch (text/plain), 37.76 KB, created by Katrin Fischer on 2020-09-26 18:27:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-09-26 18:27:52 UTC

Size: 37.76 KB

patch

obsolete

>From aecc83173ecd7565a5bccb21e1e54b2ffb921da0 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 3 Sep 2020 15:59:22 +0200
>Subject: [PATCH] Bug 26323: Retrieve the correct values for LOST, DAMAGED, LOC
> and CCODE
>
>Same as previously
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/includes/catalogue/itemsearch_item.csv.inc | 2 +-
> .../prog/en/includes/catalogue/itemsearch_item.json.inc | 6 +++---
> koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++---
> .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 8 ++++----
> .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 4 ++--
> .../intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 12 +++++++-----
> .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 8 ++++----
> .../intranet-tmpl/prog/en/modules/serials/serials-search.tt | 2 +-
> .../prog/en/modules/serials/subscription-batchedit.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc | 6 +++---
> koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 2 +-
> .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
> 21 files changed, 43 insertions(+), 41 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>index 63aaee8874..bb625bae23 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>@@ -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 %]"
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>index 4ff4579d13..1933950c07 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>@@ -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"> Edit </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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 243045b24a..5650b58fbc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -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">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>index 90cb36856a..6fe67600c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>@@ -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>
>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 239f4f5b07..8914de862f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -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 ) %]This subscription is closed.[% END %]
>- [% IF ( subscription.location ) %]Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location ) | html %][% END %]
>+ [% IF ( subscription.location ) %]Location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %][% END %]
> [% IF ( subscription.callnumber ) %]Callnumber: [% subscription.callnumber | html %] [% END %]
> [% IF ( subscription.subscriptionnotes ) %][% subscription.subscriptionnotes | html | html_line_break %] [% END %]
> [% IF ( subscription.missinglist ) %]Missing issues: [% subscription.missinglist | html %] [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index 912e3c8d35..428de8c451 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -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)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>index d72c728cf4..2d7f508f06 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>@@ -175,11 +175,11 @@
> [% IF ar.chapters %] Chapters: [% ar.chapters | html %] [% END %]
> [% IF ar.patron_notes %] Patron notes: [% ar.patron_notes | html %] [% 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 %]
>- [% AuthorisedValues.GetByCode( 'LOC', ar.item.location ) | html %]
>+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]
> [% END %]
> 
> [% ar.item.itemcallnumber | html %]
>@@ -282,11 +282,11 @@
> [% IF ar.chapters %] Chapters: [% ar.chapters | html %] [% END %]
> [% IF ar.patron_notes %] Patron notes: [% ar.patron_notes | html %] [% 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 %]
>- [% AuthorisedValues.GetByCode( 'LOC', ar.item.location ) | html %]
>+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ar.item.location ) | html %]
> [% END %]
> 
> [% ar.item.itemcallnumber | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 3a927d7f55..2a31499d7c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -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">[% AuthorisedValues.GetByCode( 'LOC', trsfitemloo.item.location ) | html %]</td>
>+ <td class="tf-location">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => trsfitemloo.item.location ) | html %]</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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 54acd980e9..38f387a6a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 9b482407b2..5b17b9776c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>index 9567fc3af9..ffb938a5ff 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>@@ -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>
>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 51d9264e92..8293979749 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -214,24 +214,26 @@
> Item shelving location updated.
> 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 %]
> 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 ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>index 2fe8d4e813..fa7c412384 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>@@ -149,9 +149,9 @@
> </div>
> 
> </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 ) %][% AuthorisedValues.GetByCode( 'LOC', itemsloo.location ) | html %] [% END %][% itemsloo.itemcallnumber | html %]</td>
>+ <td class="hq-callnumber">[% IF ( itemsloo.location ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => 'itemsloo.location ) | html %] [% 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">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>index 5e89226773..6b1abc4436 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index c72d237b25..a3d410c22d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -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 ) %]
>- [% AuthorisedValues.GetByCode( 'LOST', itemloo.itemlost ) | html %]
>+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => itemloo.itemlost ) | html %]
> [% END %]
> 
> [% IF ( itemloo.damaged ) %]
>- [% AuthorisedValues.GetByCode( 'DAMAGED', itemloo.damaged ) | html %]
>+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => itemloo.damaged ) | html %]
> [% END %]
> 
> [% IF ( itemloo.withdrawn ) %]
>- [% AuthorisedValues.GetByCode( 'WITHDRAWN', itemloo.withdrawn ) | html %]
>+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => itemloo.withdrawn ) | html %]
> [% END %]
> 
> [% IF ( itemloo.notforloan ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 32af0cc5f7..cafe629cca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -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 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index 327e08f7ba..d48809a3d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -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>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>index c15566a7be..7ee2303d80 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>@@ -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 ) %]
> [% av_lib_include | html %]
> [% 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 %]
> [% av_lib_include | html %]
> [% 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 %]
> [% av_lib_include | html %]
> [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>index ddcc3a4b69..0ff8f06782 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>@@ -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">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>index fc97a0d07c..ffd3367aa1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>@@ -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 %] [% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]</td>
>- <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %]</td>
>+ <td>[% Branches.GetName( cr.item.holdingbranch ) | html %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => cr.item.location, opac => 1 ) | html %]</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>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>index feee22d125..6101759564 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>@@ -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 ) %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26323: 109627 | 109628 | 109693 | 110767 | 110768 | 110769 | 110789 | 110790 | 110791 | 110792