Bugzilla – Attachment 95130 Details for
Bug 23827
[19.05] Cash register statistics uses old accounttype values
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23827: Correction for missed 'F' and 'FU' case
Bug-23827-Correction-for-missed-F-and-FU-case.patch (text/plain), 3.61 KB, created by
Martin Renvoize (ashimema)
on 2019-11-07 08:13:51 UTC
(
hide
)
Description:
Bug 23827: Correction for missed 'F' and 'FU' case
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-11-07 08:13:51 UTC
Size:
3.61 KB
patch
obsolete
>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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23827
:
94299
|
94305
| 95130