@@ -, +, @@ --- admin/columns_settings.yml | 4 ++++ .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 12 +++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) --- a/admin/columns_settings.yml +++ a/admin/columns_settings.yml @@ -531,6 +531,8 @@ modules: - columnname: returndate - + columnname: issuedate + - columnname: note - columnname: amount @@ -568,6 +570,8 @@ modules: - columnname: returndate - + columnname: issuedate + - columnname: note - columnname: amount --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -50,6 +50,7 @@ Barcode Due date Return date + Issue date Home library Note Amount @@ -71,6 +72,7 @@ [% IF ( account.itemnumber ) %][% account.item.barcode | html %][% END %] [% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] [% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] + [% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %] [% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %] [% account.note | html_line_break %] [% IF account.amount <= 0 %][% ELSE %][% END %][% account.amount | $Price %] @@ -100,7 +102,7 @@ [% END %] - Total due + Total due [% IF ( totalcredit ) %] [% total | $Price %] [% ELSE %] @@ -328,7 +330,7 @@ var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408 $(this).html(' '+txtInactivefilter); } - table_account_fines.fnFilter(filteredValue, 9, true, false); + table_account_fines.fnFilter(filteredValue, 10, true, false); $(this).toggleClass('filtered'); }); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -52,6 +52,7 @@ Barcode Due date Return date + Issue date Payment note Amount Amount outstanding @@ -106,6 +107,11 @@ [% line.checkout.returndate | $KohaDates with_hours => 1 %] [% END %] + + [% IF line.issue_id %] + [% line.checkout.issuedate | $KohaDates %] + [% END %] + Add note @@ -118,16 +124,16 @@ - Total due: + Total due: [% total | $Price %] [% IF outstanding_credits.total_outstanding < 0 %] - Outstanding credits could be applied: + Outstanding credits could be applied: - Total due if credit applied: + Total due if credit applied: [% total + outstanding_credits.total_outstanding | $Price %] [% END %] --