diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 2273618a4b..e2633753c8 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -571,7 +571,7 @@ sub ChargeReserveFee {
Koha::Account->new( { patron_id => $borrowernumber } )->add_debit(
{
amount => $fee,
- description => "Reserve Charge - " . $title,
+ description => $title,
note => undef,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index cf388239fb..28f5f94609 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -21,6 +21,7 @@
[%- CASE 'WO' -%]Writeoff
[%- CASE 'C' -%]Credit
[%- CASE 'CR' -%]Credit
+ [%- CASE 'Res' -%]Hold fee
[%- CASE -%][% account.accounttype | html %]
[%- END -%]
[%- END -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 22b796e8e7..ceeccad1de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -44,6 +44,7 @@
Date
+
Account type
Description of charges
Barcode
Due date
@@ -61,10 +62,10 @@
[% account.date |$KohaDates %]
+
[% PROCESS account_type_description account=account %]
- [% PROCESS account_type_description account=account %]
- [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
- [%- IF account.description %], [% account.description | html %][% END %]
+ [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
+ [%- IF account.description %][% account.description | html %][% END %]
[% IF ( account.itemnumber ) %][% account.item.biblio.title | html %][% END %]
[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]
@@ -89,7 +90,7 @@
[% END %]
-
Total due
+
Total due
[% IF ( totalcredit ) %]
[% total | $Price %]
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index 7afd743acc..9d737bf614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -7,6 +7,7 @@
[% USE ColumnsSettings %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
+[% PROCESS 'accounts.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons › Make a payment for [% patron.firstname | html %] [% patron.surname | html %]
[% INCLUDE 'doc-head-close.inc' %]
@@ -44,13 +45,13 @@
Actions
+
Account type
Description
Date
Barcode
Due date
Return date
Payment note
-
Account type
Amount
Amount outstanding
@@ -80,30 +81,10 @@
- [% SWITCH line.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 %][% line.accounttype | html %]
- [%- END -%]
- [%- IF line.description %], [% line.description | html %][% END %]
+ [% PROCESS account_type_description account=line %]
+
+
+ [%- IF line.description %][% line.description | html %][% END %]
[% IF line.itemnumber %]([% line.item.biblio.title | html %])[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
index a73da77196..68619d9783 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -8,6 +8,7 @@
[% IF ENABLE_OPAC_PAYMENTS %]
[% END %]
Date
Description
+
Type
Fine amount
Amount outstanding
@@ -48,10 +49,13 @@
[% CASE 'WO' %]Writeoff
[% CASE 'C' %]Credit
[% CASE 'CR' %]Credit
+ [%-CASE 'Res' %]Hold fee
[% CASE %][% ACCOUNT_LINE.accounttype | html %]
[%- END -%]
- [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
- [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %]
+
+
+ [%- IF ACCOUNT_LINE.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
+ [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %]
[% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %]
[% IF ( ACCOUNT_LINE.amountcredit ) %]
[% ELSE %]
[% END %][% ACCOUNT_LINE.amount | $Price %]
@@ -63,9 +67,9 @@
[%- IF ENABLE_OPAC_PAYMENTS -%]
- [%- SET COLSPAN = 4 -%]
+ [%- SET COLSPAN = 5 -%]
[%- ELSE -%]
- [%- SET COLSPAN = 3 -%]
+ [%- SET COLSPAN = 4 -%]
[%- END -%]