From 4d06d133865f83af2a70f86f2d49278684f4e207 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 16 Jan 2018 22:43:57 +0000 Subject: [PATCH] Bug 16486: [FOLLOW-UP] Show original date and timestamp for fines This patch has two columns in fines tables, one showing the original date and one showing the timestamp (when the patch was last updated) Fixed merge conflicts Signed-off-by: Marjorie Barry-Vila --- 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 | 4 +++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 6 ++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 86e899a..e7cbf2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -35,7 +35,8 @@ - + + @@ -52,6 +53,7 @@ [% FOREACH account IN accounts %] + - + + @@ -46,6 +47,7 @@ [% FOREACH account IN accounts %] + - + + @@ -46,6 +47,7 @@ [% 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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index 0954645..a0dce37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -38,7 +38,8 @@
DateOriginal dateUpdated Description of charges Note Amount
[% account.date | $KohaDates %] [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt index 39c4ccf..ca42ba3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -37,7 +37,8 @@
DateOriginal dateUpdated Description of charges Note Amount
[% account.date | $KohaDates %] [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index fb8f6f0..ba1e6c6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/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 -- 2.1.4