@@ -, +, @@ history --- .../prog/en/includes/accounts.inc | 14 ---- .../en/modules/members/accountline-details.tt | 78 +++++++++---------- .../bootstrap/en/includes/accounts.inc | 14 ---- members/accountline-details.pl | 17 ++-- 4 files changed, 47 insertions(+), 76 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -56,17 +56,3 @@ [%- CASE -%] [%- 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 'CANCELLATION' -%]Cancelled charge - [%- CASE -%][% account_offset.type | html %] - [%- END -%] -[%- 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 @@ -60,9 +60,9 @@ [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] [% IF accountline %] - [% IF type == 'credit' %] + [% IF accountline.credit_type_code %]
Date created | -Date updated | -Amount | -Amount outstanding | -Type | -Note | +Date | +Change amount | +Change type | Transacting librarian | -Date/time of change | -Amount of change | -Type of change | +Note | ||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% offset_accountline.date | $KohaDates %] | -[% offset_accountline.timestamp | $KohaDates with_hours => 1 %] | -[% offset_accountline.amount | $Price %] | -[% offset_accountline.amountoutstanding | $Price %] | -[% PROCESS account_type_description account=offset_accountline %] | -[% offset_accountline.note | html %] | -[% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %] | -[% ao.created_on | $KohaDates with_hours => 1 %] | +[% ao.created_on | $KohaDates with_hours => 1%] | [% ao.amount | $Price %] | -[% PROCESS offset_type_description account_offset=ao %] | -Details | ++ [%- IF offset_accountline -%] + [% PROCESS account_type_description account=offset_accountline %] ([% PROCESS ao_description ao=ao %]) + [%- ELSE -%] + [% PROCESS ao_description ao=ao %] + [%- END -%] + | +[% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %] | +[% offset_accountline.note | html %] | ++ [%- IF offset_accountline -%] + Details + [%- END -%] + |