@@ -, +, @@ --- Koha/Account/Line.pm | 13 ++++++++ .../en/modules/members/accountline-details.tt | 30 +++++++++++-------- 2 files changed, 31 insertions(+), 12 deletions(-) --- a/Koha/Account/Line.pm +++ a/Koha/Account/Line.pm @@ -58,6 +58,19 @@ sub patron { return Koha::Patron->_new_from_dbic( $rs ); } +=head3 manager + +Return the manager linked to this account line + +=cut + +sub manager { + my ( $self ) = @_; + my $rs = $self->_result->manager; + return unless $rs; + return Koha::Patron->_new_from_dbic( $rs ); +} + =head3 item Return the item linked to this account line if exists --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -139,11 +139,11 @@ Date - Change amount - Change type + Change + Action + Relation Transacting librarian Note -   @@ -163,7 +163,7 @@ [%- CASE 'Manual Debit' -%]Manual invoice [%- CASE 'Lost Item' -%]Lost item returned [%- CASE 'Writeoff' -%]Writeoff - [%- CASE 'Void Payment' -%]Void payment + [%- CASE 'VOID' -%]Voided [%- CASE 'CANCELLATION' -%]Cancelled charge [%- CASE 'APPLY' -%]Applied [%- CASE 'CREATE' -%]Created @@ -175,19 +175,25 @@ [% ao.created_on | $KohaDates with_hours => 1%] [% ao.amount | $Price %] - [%- IF offset_accountline -%] - [% PROCESS account_type_description account=offset_accountline %] ([% PROCESS ao_description ao=ao %]) - [%- ELSE -%] - [% PROCESS ao_description ao=ao %] - [%- END -%] + [% PROCESS ao_description ao=ao %] - [% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %] - [% offset_accountline.note | html %] [%- IF offset_accountline -%] - Details + [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) [%- END -%] + + [% IF offset_accountline.manager_id %] + + [% IF offset_accountline.manager.firstname %] + [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %] + [% ELSE %] + [% offset_accountline.manager.surname | html %] + [% END %] + + [% END %] + + [% offset_accountline.note | html %] [% END %] --