From bcc223e5608736d40a382b2380cbe41df58510f3 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 28 Mar 2017 16:39:25 +0200
Subject: [PATCH] Bug 12913: [QA Follow-up] Reword 'change item status' and add
zero status
Content-Type: text/plain; charset=utf-8
The zero status should be added in @notforloans. It is a legitimate status
for available books. The zero status description can be translated in
the template.
The 'Change item status' is confusing. We mean that we saw a notforloan
status that we do not expect (read: does not exist in the table).
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt | 14 ++++++++++----
tools/inventory.pl | 3 +++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index a76fdef..650a510 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -177,12 +177,18 @@ $(document).ready(function(){
<legend>[% status.fieldname %]</legend>
<ul id="statuses-[% fieldname %]" style="display: inline;">
[% FOREACH value IN status.values %]
- [% IF (value.lib) %]<li>
+ [% IF (value.lib) %]
+ <li>
<label for="[% value.id %]">
- [% value.lib %]
+ [% IF value.authorised_value==0 %]
+ For loan
+ [% ELSE %]
+ [% value.lib %]
+ [% END %]
</label>
<input type="checkbox" name="status-[% status.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
- </li>[% END %]
+ </li>
+ [% END %]
[% END %]
</ul>
</fieldset>
@@ -293,7 +299,7 @@ $(document).ready(function(){
[% ELSIF result.problem == 'missingitem' %]
<p>Item missing</p>
[% ELSIF result.problem == 'changestatus' %]
- <p>Change item status</p>
+ <p>Unknown not-for-loan status</p>
[% ELSIF result.problem == 'not_scanned' %]
<p>Item should have been scanned</p>
[% END %]
diff --git a/tools/inventory.pl b/tools/inventory.pl
index be57303..b46a554 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -94,6 +94,9 @@ for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.dama
$hash->{authcode} = $mss->count ? $mss->next->authorised_value : undef;
if ($hash->{authcode}){
my $arr = GetAuthorisedValues($hash->{authcode});
+ # Add notforloan == 0 to the list of possible notforloan statuses
+ # The lib value is replaced in the template
+ push @$arr, { authorised_value => 0, id => 'stat0' , lib => 'ignore' };
$hash->{values} = $arr;
push @$statuses, $hash;
if ( $statfield eq 'items.notforloan') {
--
2.1.4