Bug 25690: (QA follow-up) PROCESSED -> PROCESSING for consistency

PROCESSED gave the apearance that the item processing had been completed
whereas in reading the code it appears to actually signify that the item
is awaiting/in proessing state.

This patch updates the variable to be PROCESSING consistently throughout
the codebase.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9ca5e5a..03fe5c7 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1149,7 +1149,7 @@ sub CanBookBeIssued {
                 }
                 elsif ( $restype eq "Processing" ) {
                     # The item is determined hold being processed for someone else.
-                    $needsconfirmation{PROCESSED} = 1;
+                    $needsconfirmation{PROCESSING} = 1;
                     $needsconfirmation{'resfirstname'} = $patron->firstname;
                     $needsconfirmation{'ressurname'} = $patron->surname;
                     $needsconfirmation{'rescardnumber'} = $patron->cardnumber;

diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm
index fbd3816..2386d90 100644 (file)
--- a/C4/SIP/ILS/Transaction/Checkout.pm
+++ b/C4/SIP/ILS/Transaction/Checkout.pm
@@ -76,7 +76,7 @@ sub do_checkout {
                 next;
             } elsif ($confirmation eq 'RESERVE_WAITING'
                       or $confirmation eq 'TRANSFERRED'
-                      or $confirmation eq 'PROCESSED') {
+                      or $confirmation eq 'PROCESSING') {
                $debug and warn "Item is on hold for another patron.";
                $self->screen_msg("Item is on hold for another patron.");
                $noerror = 0;

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index c795236..95ec789 100755 (executable)
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -224,7 +224,7 @@ $template->param(
     reserved                => $reserved,
     waiting                 => $waiting,
     transferred             => $hold_transferred,
-    processed               => $hold_processed,
+    processing              => $hold_processed,
     borrowernumber          => $borrowernumber,
     itemnumber              => $itemnumber,
     barcode                 => $barcode,

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 89a7f6d..a1c0e5f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -50,7 +50,7 @@
                     <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
                     <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                     <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
-                    [% IF ( waiting or transferred or processed ) %]
+                    [% IF ( waiting or transferred or processing ) %]
                         <input type="hidden" name="barcode" value="[% barcode | html %]" />
                         <input type="hidden" name="request" value="KillWaiting" />
                         <input type="submit" value="Cancel" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index a71fb28..e0ea618 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -126,7 +126,7 @@
                                     <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]</li>
                                 [% END %]
 
-                                [% IF ( PROCESSED ) %]
+                                [% IF ( PROCESSING ) %]
                                     <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is being processed for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]</li>
                                 [% END %]
 
@@ -254,7 +254,7 @@
                                         </p>
                                     [% END %]
 
-                                    [% IF ( PROCESSED ) %]
+                                    [% IF ( PROCESSING ) %]
                                         <p>
                                             <label for="cancelreserve">Cancel hold</label>
                                             <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" /><br />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 6afb301..4fe30d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -150,7 +150,7 @@
                   [% IF checkout_info.TRANSFERRED %]
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold and being transferred to another patron.</li>
                   [% END %]
-                  [% IF checkout_info.PROCESSED %]
+                  [% IF checkout_info.PROCESSING %]
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold and being processed for another patron.</li>
                   [% END %]
                   [% IF checkout_info.ISSUED_TO_ANOTHER %]
@@ -193,7 +193,7 @@
                       </script>
                   [% END %]
 
-                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSED ) %] <!-- arbitrary choice, revert the reserve is not possible-->
+                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] <!-- arbitrary choice, revert the reserve is not possible-->
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li>
                   [% ELSIF checkout_info.RESERVED %]
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>