gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29271: (QA follow-up) Fetch and send descriptions to template 

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
This commit is contained in:
Nick Clemens 2021-10-20 14:06:29 +00:00 committed by Victor Grousset/tuxayo
parent f103c9759d
commit 274ca0f1de
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
View File

@ -1,16 +1,16 @@
[%- BLOCK account_type_description -%]
<span>
[%- IF account.credit_type_code -%]
[%- PROCESS credit_type_description credit_type_code = account.credit_type_code -%]
[%- PROCESS credit_type_description credit_type_code = account.credit_type -%]
[%- ELSIF account.debit_type_code -%]
[%- PROCESS debit_type_description debit_type_code = account.debit_type_code -%]
[%- PROCESS debit_type_description debit_type_code = account.debit_type -%]
[%- END -%]
[%- PROCESS account_status_description account=account -%]
</span>
[%- END -%]
[%- BLOCK debit_type_description -%]
[%- SWITCH debit_type_code -%]
[%- SWITCH debit_type.code -%]
[%- CASE 'ACCOUNT' -%]Account creation fee
[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
[%- CASE 'LOST' -%]Lost item
@ -30,7 +30,7 @@
[%- END -%]
[%- BLOCK credit_type_description -%]
[%- SWITCH credit_type_code -%]
[%- SWITCH credit_type.code -%]
[%- CASE 'PAYMENT' -%]Payment
[%- CASE 'WRITEOFF' -%]Writeoff
[%- CASE 'FORGIVEN' -%]Forgiven

4
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
View File

@ -16,7 +16,6 @@
<body id="cash_register_stats" class="rep">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
[% INCLUDE 'accounts.inc' %]
<div id="breadcrumbs">
<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
@ -159,8 +158,7 @@
<td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
<td>[% loopresul.branchname | html %]</td>
<td>[% loopresul.date | $KohaDates %]</td>
<td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
<td>[% PROCESS account_type_description account=loopresul %]</td>
<td>[% loopresul.type_description | html %]</td>
<td>[% loopresul.note | html %]</td>
<td style="text-align:right;">[% loopresul.amount | $Price %]</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>

10
reports/cash_register_stats.pl
View File

@ -103,10 +103,10 @@ if ($do_it) {
}
my $query = "
SELECT round(amount,2) AS amount, description,
SELECT round(amount,2) AS amount, al.description,
bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
bo.cardnumber, br.branchname, bo.borrowernumber,
al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note,
al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, COALESCE(act.description,al.credit_type_code,adt.description,al.debit_type_code) AS type_description, al.amountoutstanding, al.note,
bi.title, bi.biblionumber, i.barcode, i.itype
FROM accountlines al
LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
@ -114,6 +114,8 @@ if ($do_it) {
LEFT JOIN branches br ON (br.branchcode = m.branchcode )
LEFT JOIN items i ON (i.itemnumber = al.itemnumber)
LEFT JOIN biblio bi ON (bi.biblionumber = i.biblionumber)
LEFT JOIN account_credit_types act ON (al.credit_type_code = act.code)
LEFT JOIN account_debit_types adt ON (al.debit_type_code = adt.code)
WHERE CAST(al.date AS DATE) BETWEEN ? AND ?
$whereTType
$whereBranchCode
@ -166,7 +168,7 @@ if ($do_it) {
$row->{bfirstname} . ' ' . $row->{bsurname},
$row->{branchname},
$row->{date},
$row->{credit_type_code} || $row->{debit_type_code},
$row->{type_description},
$row->{note},
$row->{amount},
$row->{title},
@ -175,7 +177,7 @@ if ($do_it) {
push (@rows, \@rowValues) ;
}
my @total;
for (1..7){push(@total,"")};
for (1..6){push(@total,"")};
push(@total, $grantotal);
print $input->header(
-type => 'text/csv',