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

Bug 17154 : Note column is missing on account lines receipt 

When displaying Fines > Account tab for a patron, you can see on screen a Note column that is missing if you click on Print

    Test plan :
    * Find a patron with accountlines or add them manually (Create manual invoice/credit).
    * Be sure some of them got a Note
    * Clik on Print fior those lines

    Without patch, the printed receipt does not show the Note column
    with the patch, the printed receipt shows a Note column and Note content is correctly printed for accountline with a note.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 734d08c2af)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a8dbb0cae8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This commit is contained in:
Sophie Meynieux 2016-08-22 12:02:11 +02:00 committed by Julian Maurice
parent 0fe9687548
commit d90e1c0086
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
View File

@ -15,23 +15,23 @@
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=3 class="centerednames">
<th colspan=4 class="centerednames">
<h3>[% LibraryName %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=3 class="centerednames">
<th colspan=4 class="centerednames">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=3 class="centerednames">
<th colspan=4 class="centerednames">
[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
</th>
</tr>
<tr>
<th colspan=3 >
<th colspan=4 >
Received with thanks from [% firstname %] [% surname %] <br />
Card number : [% cardnumber %]<br />
</th>
@ -39,6 +39,7 @@
<tr>
<th>Date</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
</tr>
@ -61,13 +62,14 @@
[%- END -%]
[%- IF account.description %], [% account.description %][% END %]
</td>
<td>[% account.note %]</td>
[% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
</tr>
[% END %]
<tfoot>
<tr>
<td colspan="2">Total outstanding dues as on date : </td>
<td colspan="3">Total outstanding dues as on date : </td>
[% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
</tr>
</tfoot>

12
koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
View File

@ -13,23 +13,23 @@
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan="4" class="centerednames">
<th colspan="5" class="centerednames">
<h3>[% LibraryName %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan="4" class="centerednames">
<th colspan="5" class="centerednames">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan="4" class="centerednames">
<th colspan="5" class="centerednames">
[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
</th>
</tr>
<tr>
<th colspan="4" >
<th colspan="5" >
Bill to: [% firstname %] [% surname %] <br />
Card number: [% cardnumber %]<br />
</th>
@ -37,6 +37,7 @@
<tr>
<th>Date</th>
<th>Description of charges</th>
<th>Note</th>
<th style="text-align:right;">Amount</th>
<th style="text-align:right;">Amount outstanding</th>
</tr>
@ -60,6 +61,7 @@
[%- END -%]
[%- IF account.description %], [% account.description %][% END %]
</td>
<td>[% account.note %]</td>
[% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
[% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
</tr>
@ -67,7 +69,7 @@
[% END %]
<tfoot>
<tr>
<td colspan="3">Total outstanding dues as on date: </td>
<td colspan="4">Total outstanding dues as on date: </td>
[% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
</tr>
</tfoot>

1
members/printfeercpt.pl
View File

@ -101,6 +101,7 @@ for (my $i=0;$i<$numaccts;$i++){
'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
'accountno' => $accts->[$i]{'accountno'},
accounttype => $accts->[$i]{accounttype},
'note' => $accts->[$i]{'note'},
);
if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){

1
members/printinvoice.pl
View File

@ -100,6 +100,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
'amountoutstanding' => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
'accountno' => $accts->[$i]{'accountno'},
accounttype => $accts->[$i]{accounttype},
'note' => $accts->[$i]{'note'},
);
if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {