From 1177e4ffb5dc169f274a560498b82b88067689d5 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 21 Apr 2023 02:50:52 +0000 Subject: [PATCH] Bug 33478: Apply formatting to ACCOUNT_DEBIT To test: 1. Go to a patron accounting page 2. Create a manual invoice and Save 3. You'll be redirected to the Transactions tab 4. Click the Print button next to your invoice 5. Confirm your format settings for ACCOUNT_DEBIT are applied --- .../prog/en/modules/members/printinvoice.tt | 15 +++++---------- members/printinvoice.pl | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) 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 2393e209be7..e8cf56f683a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -14,20 +14,15 @@ [% INCLUDE 'blocking_errors.inc' %] - +[% PROCESS 'notice_format_translations.inc' %] +
- [% IF slip %] - [% IF plain %] - 
-      [% slip | html %]
-
+ [% IF ( slip ) %] + [% PROCESS 'slip_content.inc' notice=slip %] [% ELSE %] - [% slip | $raw %] + No print template found [% END %] - [% ELSE %] - No print template found - [% END %]
[% MACRO jsinclude BLOCK %] diff --git a/members/printinvoice.pl b/members/printinvoice.pl index 7d591c44d23..15fc8a11c15 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -80,8 +80,7 @@ $letter //= C4::Letters::GetPreparedLetter( ); $template->param( - slip => $letter->{content}, - plain => !$letter->{is_html}, + slip => $letter, patron => $patron, ); -- 2.30.2