From fe5e75057158f0d274d00d987248cf7758ef197c Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Wed, 19 Sep 2018 08:07:57 +0000 Subject: [PATCH] Bug 21167: (QA follow-up) Use accounttype.inc for generating account description Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit a6a7516652115ccc49099f045ed8c23a9f29eb26) Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/printfeercpt.tt | 26 ++----------------- .../prog/en/modules/members/printinvoice.tt | 26 ++----------------- 2 files changed, 4 insertions(+), 48 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 3e28a61afa..8a2b06c0e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -50,30 +50,8 @@ [% account.date | $KohaDates %] - [% SWITCH account.accounttype %] - [% CASE 'Pay' %]Payment, thanks - [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) - [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) - [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) - [% CASE 'N' %]New card - [% CASE 'F' %]Fine - [% CASE 'A' %]Account management fee - [% CASE 'M' %]Sundry - [% CASE 'L' %]Lost item - [% CASE 'W' %]Writeoff - [% CASE 'FU' %]Accruing fine - [% CASE 'HE' %]Hold waiting too long - [% CASE 'Rent' %]Rental fee - [% CASE 'FOR' %]Forgiven - [% CASE 'LR' %]Lost item fee refund - [% CASE 'PF' %]Processing fee - [% CASE 'PAY' %]Payment - [% CASE 'WO' %]Writeoff - [% CASE 'C' %]Credit - [% CASE 'CR' %]Credit - [% CASE %][% account.accounttype | html %] - [%- END -%] - [%- IF account.description %], [% account.description %][% END %] + [% INCLUDE 'accounttype.inc' account => account %] + [%- IF account.description %], [% account.description | html %][% END %] [% account.note %] [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount | $Price %] 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 3ee59ced84..03e6da8c80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -50,30 +50,8 @@ [% account.date | $KohaDates%] - [% SWITCH account.accounttype %] - [% CASE 'Pay' %]Payment, thanks - [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) - [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) - [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) - [% CASE 'N' %]New card - [% CASE 'F' %]Fine - [% CASE 'A' %]Account management fee - [% CASE 'M' %]Sundry - [% CASE 'L' %]Lost item - [% CASE 'W' %]Writeoff - [% CASE 'FU' %]Accruing fine - [% CASE 'HE' %]Hold waiting too long - [% CASE 'Rent' %]Rental fee - [% CASE 'FOR' %]Forgiven - [% CASE 'LR' %]Lost item fee refund - [% CASE 'PF' %]Processing fee - [% CASE 'PAY' %]Payment - [% CASE 'WO' %]Writeoff - [% CASE 'C' %]Credit - [% CASE 'CR' %]Credit - [% CASE %][% account.accounttype %] - [%- END -%] - [%- IF account.description %], [% account.description %][% END %] + [% INCLUDE 'accounttype.inc' account => account %] + [%- IF account.description %], [% account.description | html %][% END %] [% account.note %] [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount | $Price %] -- 2.39.5