@@ -, +, @@ fines --- koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 8 +++++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 6 ++++-- members/printfeercpt.pl | 3 ++- members/printinvoice.pl | 1 + 6 files changed, 18 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 @@ -65,7 +65,8 @@ $(document).ready(function() { - + + @@ -82,6 +83,7 @@ $(document).ready(function() { [% FOREACH account IN accounts %] + - + + @@ -43,6 +44,7 @@ [% FOREACH account IN accounts %] + - + + @@ -44,8 +45,9 @@ [% FOREACH account IN accounts %] - - + + [% IF ENABLE_OPAC_PAYMENTS %][% END %] - + + @@ -102,7 +103,8 @@ [% END %] [% END %] - + +
DateOriginal dateUpdated Description of charges Note Amount
[% account.date | $KohaDates %] [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -35,7 +35,8 @@
DateOriginal dateUpdated Description of charges Note Amount
[% account.date | $KohaDates %] [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -35,7 +35,8 @@
DateOriginal dateUpdated Description of charges Note Amount
[% account.timestamp | $KohaDates with_hours => 1 %] + [% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] [% CASE 'Pay' %]Payment, thanks [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -71,7 +71,8 @@
 DateOriginal dateUpdated Description Fine amount Amount outstanding[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %][% ACCOUNT_LINE.date | $KohaDates %][% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %] [% SWITCH ACCOUNT_LINE.accounttype %] [% CASE 'Pay' %]Payment, thanks --- a/members/printfeercpt.pl +++ a/members/printfeercpt.pl @@ -97,7 +97,8 @@ for (my $i=0;$i<$numaccts;$i++){ $accts->[$i]{'amountoutstandingcredit'} = 1; } - my %row = ( 'timestamp' => $accts->[$i]{'timestamp'}, + my %row = ( 'date' => dt_from_string( $accts->[$i]{'date'} ), + 'timestamp' => $accts->[$i]{'timestamp'}, 'amountcredit' => $accts->[$i]{'amountcredit'}, 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'}, 'toggle' => $accts->[$i]{'toggle'}, --- a/members/printinvoice.pl +++ a/members/printinvoice.pl @@ -97,6 +97,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) { } my %row = ( + 'date' => dt_from_string( $accts->[$i]{'date'} ), 'timestamp' => $accts->[$i]{'timestamp'}, 'amountcredit' => $accts->[$i]{'amountcredit'}, 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'}, --