From d5b0258308e7c336661cb2dd79d474d73afec0ea Mon Sep 17 00:00:00 2001 From: Sophie Meynieux <sophie.meynieux@biblibre.com> Date: Mon, 22 Aug 2016 12:02:11 +0200 Subject: [PATCH] [SIGNED-OFF] 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> --- .../intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 12 +++++++----- .../intranet-tmpl/prog/en/modules/members/printinvoice.tt | 12 +++++++----- members/printfeercpt.pl | 1 + members/printinvoice.pl | 1 + 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index 494e8d5..0b95e14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -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> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt index 50e7254..6bc8ebb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -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> diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index 0808bba..ef5cdd2 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.pl @@ -102,6 +102,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'){ diff --git a/members/printinvoice.pl b/members/printinvoice.pl index 4999fbb..8a46502 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -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' ) { -- 2.1.4