Bugzilla – Attachment 54010 Details for
Bug 6934
New report Cash Register Statistics
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug6934: rename active transaction with All payments to the library and grouping in it the relevant account types 'Pay' 'C'
Bug6934-rename-active-transaction-with-All-payment.patch (text/plain), 4.20 KB, created by
Bouzid Fergani
on 2016-08-04 19:05:40 UTC
(
hide
)
Description:
Bug6934: rename active transaction with All payments to the library and grouping in it the relevant account types 'Pay' 'C'
Filename:
MIME Type:
Creator:
Bouzid Fergani
Created:
2016-08-04 19:05:40 UTC
Size:
4.20 KB
patch
obsolete
>From 068921e929e5a512423d9101de21bd13d0083a08 Mon Sep 17 00:00:00 2001 >From: Bouzid Fergani <bouzid.fergani@inlibro.com> >Date: Thu, 4 Aug 2016 14:56:33 -0400 >Subject: [PATCH] Bug6934: rename active transaction with All payments to the > library and grouping in it the relevant account types 'Pay' 'C' > > rename Patron carnumber on Patron card number > fix src databales.js >--- > .../prog/en/includes/csv_headers/reports/cash_register_stats.tt | 2 +- > .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt | 9 ++++----- > reports/cash_register_stats.pl | 2 +- > 3 files changed, 6 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt >index 92f3400..e70f1b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt >@@ -1 +1 @@ >-mfirstname[% sep %]cardnumber[% sep %]bfirstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]"itype" >+mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]"itype" >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 5de0626..04b7f12 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 >@@ -6,7 +6,6 @@ > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > <script type="text/javascript" id="js"> > $(document).ready(function() { > $("#tbl_cash_register_stats").dataTable($.extend(true, {}, dataTablesDefaults, { >@@ -106,9 +105,9 @@ $(document).ready(function() { > [% END %] > > [% IF transaction_type == "ACT" %] >- <option value="ACT" selected="selected">Active transactions</option> >+ <option value="ACT" selected="selected">All payments to the library</option> > [% ELSE %] >- <option value="ACT">Active transactions</option> >+ <option value="ACT">All payments to the library</option> > [% END %] > > [% IF transaction_type == "C" %] >@@ -226,7 +225,7 @@ $(document).ready(function() { > <thead> > <tr> > <th>Manager name</th> >- <th>Patron cardnumber</th> >+ <th>Patron card number</th> > <th>Patron name</th> > <th>Transaction branch</th> > <th>Transaction date</th> >@@ -247,7 +246,7 @@ $(document).ready(function() { > <td>[% loopresul.date | $KohaDates %]</td> > <td> > [% IF loopresul.accounttype == "ACT" %] >- <span>Active transactions</span> >+ <span>All payments to the library</span> > [% ELSIF loopresul.accounttype == "C" || loopresul.accounttype == "CR" %] > <span>Credit</span> > [% ELSIF loopresul.accounttype == "FORW" || loopresul.accounttype == "W" %] >diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl >index ac5ea90..ba4f14f 100755 >--- a/reports/cash_register_stats.pl >+++ b/reports/cash_register_stats.pl >@@ -71,7 +71,7 @@ if ($do_it) { > if ($transaction_type eq 'ALL') { #All Transactons > $whereTType = ''; > } elsif ($transaction_type eq 'ACT') { #Active >- $whereTType = " accounttype NOT IN ('F', 'FU', 'FOR', 'M', 'L') AND "; >+ $whereTType = " accounttype IN ('Pay','C') AND "; > } else { #Single transac type > if ($transaction_type eq 'FORW') { > $whereTType = " accounttype = 'FOR' OR accounttype = 'W' AND "; >-- >1.9.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 6934
:
5634
|
5635
|
5640
|
5641
|
9379
|
9419
|
12602
|
12660
|
31210
|
36476
|
42564
|
42565
|
44847
|
44853
|
45972
|
45973
|
45974
|
48634
|
48642
|
48704
|
48705
|
48706
|
48707
|
48708
|
50429
|
50437
|
50938
|
53496
|
53500
|
53570
|
53571
|
53572
|
53573
|
53574
|
53575
|
53576
|
53577
|
53578
|
53579
|
53581
|
53582
|
53583
|
53584
|
53585
|
53586
|
53587
|
53588
|
53589
|
53590
|
53591
|
53648
|
53650
|
53651
|
53652
|
53653
|
53778
|
53780
|
54010
|
54088
|
54089
|
54090
|
54091
|
54092
|
54093
|
54094
|
54095
|
54096
|
54097
|
54098
|
54099
|
54100
|
55939
|
55988
|
55989
|
55990
|
55991
|
55992
|
55993
|
55994
|
55995
|
55996
|
55997
|
55998
|
55999
|
56000
|
56001
|
56763
|
56764