From d65373b5b0de90097d89a7f16e3d598457f65d09 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 16 Oct 2019 15:58:36 +0100
Subject: [PATCH] Bug 23827: Correction for missed 'F' and 'FU' case

When replacing F and FU with 'OVERDUE' + status in bug 22521 I missed
the cases inside the cash_register_stats template. This patch should
correct that mistake.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 .../en/modules/reports/cash_register_stats.tt    | 16 ++++++++--------
 reports/cash_register_stats.pl                   |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index 1aca2fb209..25abde2da4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -78,16 +78,16 @@
                         <option value="FORW">Write off</option>
                         [% END %]
 
-                        [% IF transaction_type == "F" %]
-                        <option value="F" selected="selected">Fine</option>
+                        [% IF transaction_type == "OVERDUE" %]
+                        <option value="OVERDUE" selected="selected">Fine</option>
                         [% ELSE %]
-                        <option value="F">Fine</option>
+                        <option value="OVERDUE">Fine</option>
                         [% END %]
 
-                        [% IF transaction_type == "FU" %]
-                        <option value="FU" selected="selected">Accruing fine</option>
+                        [% IF transaction_type == "OVERDUEA" %]
+                        <option value="OVERDUEA" selected="selected">Accruing fine</option>
                         [% ELSE %]
-                        <option value="FU">Accruing fine</option>
+                        <option value="OVERDUEA">Accruing fine</option>
                         [% END %]
 
                         [% IF transaction_type == "PAY" %]
@@ -201,9 +201,9 @@
                         <span>Credit</span>
                     [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %]
                         <span>Write off</span>
-                    [% ELSIF loopresul.accounttype == "F" %]
+                    [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status != "UNRETURNED" %]
                         <span>Fine</span>
-                    [% ELSIF loopresul.accounttype == "FU" %]
+                    [% ELSIF loopresul.accounttype == "OVERDUE" && loopresul.status == "UNRETURNED" %]
                         <span>Accruing fine</span>
                     [% ELSIF loopresul.accounttype == "Pay" %]
                         <span>Payment</span>
diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index b030f6684e..d84f9bb195 100755
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -76,6 +76,10 @@ if ($do_it) {
     } else { #Single transac type
         if ($transaction_type eq 'FORW') {
             $whereTType = q{ AND accounttype IN ('FOR','W') };
+        } elsif ( $transaction_type eq 'OVERDUEA' ) {
+            $whereTType = q{ AND accounttype = 'OVERDUE' AND status = 'UNRETURNED' };
+        } elsif ( $transaction_type eq 'OVERDUE' ) {
+            $whereTType = q{ AND accounttype = 'OVERDUE' AND status != 'UNRETURNED' };
         } else {
             $whereTType = q{ AND accounttype = ? };
             push @extra_params, $transaction_type;
-- 
2.20.1