@@ -, +, @@ type descriptions - Apply this patch - Verify the templates work as expected - Sign off :-D --- .../prog/en/includes/account_offset_type.inc | 10 ----- .../prog/en/includes/accounts.inc | 39 +++++++++++++++++++ .../prog/en/includes/accounttype.inc | 24 ------------ .../en/modules/members/accountline-details.tt | 8 ++-- .../prog/en/modules/members/boraccount.tt | 5 ++- .../en/modules/members/moremember-print.tt | 5 ++- .../prog/en/modules/members/printfeercpt.tt | 5 ++- .../prog/en/modules/members/printinvoice.tt | 5 ++- 8 files changed, 60 insertions(+), 41 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc --- a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc @@ -1,10 +0,0 @@ -[% SWITCH account_offset.type %] - [% CASE 'Credit Applied' %]Credit applied - [% CASE 'Payment' %]Payment - [% CASE 'Manual Credit' %]Manual credit - [% CASE 'Manual Debit' %]Manual invoice - [% CASE 'Lost Item' %]Lost item returned - [% CASE 'Writeoff' %]Writeoff - [% CASE 'Void Payment' %]Void payment - [% CASE %][% account_offset.type | html %] -[%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -0,0 +1,39 @@ +[%- BLOCK account_type_description -%] + [%- 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 'VOID' -%]Voided + [%- 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 -%] +[%- END -%] + +[%- BLOCK offset_type_description -%] + [%- SWITCH account_offset.type -%] + [%- CASE 'Credit Applied' -%]Credit applied + [%- CASE 'Payment' -%]Payment + [%- CASE 'Manual Credit' -%]Manual credit + [%- CASE 'Manual Debit' -%]Manual invoice + [%- CASE 'Lost Item' -%]Lost item returned + [%- CASE 'Writeoff' -%]Writeoff + [%- CASE 'Void Payment' -%]Void payment + [%- CASE -%][% account_offset.type | html %] + [%- END -%] +[%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc @@ -1,24 +0,0 @@ -[% 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 'VOID' %]Voided - [% 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 -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -3,6 +3,8 @@ [%- USE AuthorisedValues -%] [%- USE Branches -%] +[% INCLUDE 'accounts.inc' %] + [% INCLUDE 'doc-head-open.inc' %]