@@ -, +, @@ description without changing accountlines After applying patches 24485 and 24486 above, this patch will adjust things This templates have been expanded to handle accounttype codes that I could find 'select distinct accounttype from accountlines;' to confirm the set is --- .../prog/en/modules/members/boraccount.tt | 23 +++++++++++++++++----- .../intranet-tmpl/prog/en/modules/members/pay.tt | 17 +++++++++++++--- members/boraccount.pl | 2 ++ members/pay.pl | 5 +++++ 4 files changed, 39 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -48,15 +48,28 @@ [% SWITCH account.accounttype %] [% CASE 'Pay' %]Payment,thanks [% CASE 'N' %]New Card - [% CASE 'F' %]Fine, [% account.title %] - [% CASE 'A' %]Account management fee + [% CASE 'F' %]Fine + [% CASE 'FU' %]Fine Adjusted + [% CASE 'FN' %]Fine + [% CASE 'FFOR' %]Fine Forgiven On Return + [% CASE 'A' %]Account Management Fee [% CASE 'M' %]Sundry - [% CASE 'L' %]Lost + [% CASE 'L' %]Lost Item + [% CASE 'LR' %]Lost & Refunded [% CASE 'W' %]Writeoff + [% CASE 'Rent' %]Rental + [% CASE 'REF' %]Refund Cash + [% CASE 'Rep' %]Replaced + [% CASE 'Res' %]Reserve + [% CASE 'O' %]Overdue [% CASE %][% account.accounttype %] [%- END -%] - [%- IF account.description %], [% account.description %][% END %] -  [% IF ( account.itemnumber ) %]View item [% END %] + [%- IF account.accounttype == 'Rent' AND account.description.match('enewal') %] Renewal[% END %] + [%- IF account.title %] ( [% account.title |html_entity %] + [% IF account.item AND account.item.barcode %] [% account.item.barcode |html_entity %][% END %] ) + [% END %] +  [% IF ( account.itemnumber ) %]View item [% END %] + [% account.note | html_line_break %] [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount %] [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -119,14 +119,25 @@ function enableCheckboxActions(){ [% CASE 'Pay' %]Payment,thanks [% CASE 'N' %]New Card [% CASE 'F' %]Fine - [% CASE 'A' %]Account management fee + [% CASE 'FU' %]Fine Adjusted + [% CASE 'FN' %]Fine + [% CASE 'FFOR' %]Fine Forgiven On Return + [% CASE 'A' %]Account Management Fee [% CASE 'M' %]Sundry [% CASE 'L' %]Lost Item + [% CASE 'LR' %]Lost & Refunded [% CASE 'W' %]Writeoff + [% CASE 'Rent' %]Rental + [% CASE 'REF' %]Refund Cash + [% CASE 'Rep' %]Replaced + [% CASE 'Res' %]Reserve + [% CASE 'O' %]Overdue [% CASE %][% line.accounttype %] [%- END -%] - [%- IF line.description %], [% line.description %][% END %] - [% IF line.title %]([% line.title |html_entity %])[% END %] + [%- IF line.accounttype == 'Rent' AND line.description.match('enewal') %] Renewal[% END %] + [%- IF line.title %] ( [% line.title |html_entity %] + [% IF line.item AND line.item.barcode %] [% line.item.barcode |html_entity %] [% END %]) + [% END %] [% line.accounttype %] --- a/members/boraccount.pl +++ a/members/boraccount.pl @@ -32,6 +32,7 @@ use CGI; use C4::Members; use C4::Branch; use C4::Accounts; +use C4::Biblio; use C4::Members::Attributes qw(GetBorrowerAttributes); my $input=new CGI; @@ -88,6 +89,7 @@ foreach my $accountline ( @{$accts}) { $accountline->{payment} = 1; $reverse_col = 1; } + $accountline->{item} = GetBiblioFromItemNumber($accountline->{itemnumber}); } $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); --- a/members/pay.pl +++ a/members/pay.pl @@ -40,6 +40,7 @@ use C4::Stats; use C4::Koha; use C4::Overdues; use C4::Branch; +use C4::Biblio; use C4::Members::Attributes qw(GetBorrowerAttributes); our $input = CGI->new; @@ -123,6 +124,10 @@ sub add_accounts_to_template { GetBorNotifyAcctRecord( $borrowernumber, $notify_id ); if ( @{$accountlines} ) { my $totalnotify = AmountNotify( $notify_id, $borrowernumber ); + foreach my $accountline (@{$accountlines}) { + my $item = GetBiblioFromItemNumber($accountline->{itemnumber}); + $accountline->{item} = $item; + } push @{$accounts}, { accountlines => $accountlines, notify => $notify_id, --