Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 6934: rename active transaction with All payments to the library and grouping in it the relevant account types 'Pay' 'C'

Browse source 
rename Patron carnumber on Patron card number
    fix src databales.js

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Bouzid Fergani 2016-08-04 14:56:33 -04:00 committed by Kyle M Hall
parent 337be9f10e
commit a27b57c327
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
View file

@ -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"

9
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
View file

@ -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" %]

2
reports/cash_register_stats.pl
View file

@ -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 ";