From 734d08c2af16909f96b19003c4cc1d758b74f11d Mon Sep 17 00:00:00 2001 From: Sophie Meynieux Date: Mon, 22 Aug 2016 12:02:11 +0200 Subject: [PATCH] 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 Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall --- .../prog/en/modules/members/printfeercpt.tt | 12 +++++++----- .../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 494e8d52f6..0b95e147ba 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 @@ [% IF ( LibraryName ) %] - [% END %] - - - @@ -39,6 +39,7 @@ + @@ -61,13 +62,14 @@ [%- END -%] [%- IF account.description %], [% account.description %][% END %] + [% IF ( account.amountcredit ) %] [% END %] - + [% IF ( totalcredit ) %] 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 50e72546d6..6bc8ebb5f8 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 @@
+

[% LibraryName %]
+

Fee receipt
+ [% IF ( branchname ) %]

[% branchname %]

[% END %]
+ Received with thanks from [% firstname %] [% surname %]
Card number : [% cardnumber %]
Date Description of chargesNote Amount
[% account.note %][% ELSE %][% END %][% account.amount %]
Total outstanding dues as on date : Total outstanding dues as on date : [% ELSE %][% END %][% total %]
[% IF ( LibraryName ) %] - [% END %] - - - @@ -37,6 +37,7 @@ + @@ -60,6 +61,7 @@ [%- END -%] [%- IF account.description %], [% account.description %][% END %] + [% IF ( account.amountcredit ) %] [% IF ( account.amountoutstandingcredit ) %] @@ -67,7 +69,7 @@ [% END %] - + [% IF ( totalcredit ) %] diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index f2dad01fac..c92dbd67bf 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.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'){ diff --git a/members/printinvoice.pl b/members/printinvoice.pl index d36746aae7..252c241432 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.39.5
+

[% LibraryName %]
+

INVOICE
+ [% IF ( branchname ) %]

[% branchname %]

[% END %]
+ Bill to: [% firstname %] [% surname %]
Card number: [% cardnumber %]
Date Description of chargesNote Amount Amount outstanding
[% account.note %][% ELSE %][% END %][% account.amount %][% ELSE %][% END %][% account.amountoutstanding %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total %]