From 053e1a4eddf39cbf938cca09a99b0a0952fc2f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nazl=C4=B1=20=C3=87etin?= Date: Mon, 17 Dec 2018 12:44:52 +0000 Subject: [PATCH] Bug 19489: (Improvements in KohaDate) Development for fines and Fees Module --- .../intranet-tmpl/prog/en/modules/members/accountline-details.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 4 ++-- members/printinvoice.pl | 2 -- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index acee3ed6016..687326b29eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -69,13 +69,13 @@ [% IF ( accountline.issue_id ) %] - [% accountline.issue.date_due | $KohaDates with_hours => 1 | html %] + [% accountline.issue.date_due | $KohaDates as_due_date => 1 %] [% END %] [% IF ( accountline.issue_id ) %] - [% accountline.issue.returndate | $KohaDates with_hours => 1 | html %] + [% accountline.issue.returndate | $KohaDates with_hours => 1 %] [% END %] 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 c1ac655667f..87cf71c6d64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -68,8 +68,8 @@ [%- IF account.description %], [% account.description | html %][% END %]  [% IF ( account.itemnumber ) %][% account.item.biblio.title | html %][% END %] [% IF ( account.itemnumber ) %][% account.item.barcode | html %][% END %] - [% IF ( account.issue_id ) %][% account.issue.date_due | $KohaDates with_hours => 1 | html %][% END %] - [% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 | html %][% END %] + [% IF ( account.issue_id ) %][% account.issue.date_due | $KohaDates as_due_date => 1 %][% END %] + [% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 %][% 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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index c9d96ced26e..1c4f274ffc2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -119,12 +119,12 @@ [% IF line.issue_id %] - [% line.issue.date_due | $KohaDates with_hours => 1 | html %] + [% line.issue.date_due | $KohaDates as_due_date => 1 %] [% END %] [% IF line.issue_id %] - [% line.issue.returndate | $KohaDates with_hours => 1 | html %] + [% line.issue.returndate | $KohaDates with_hours => 1 %] [% END %] 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 1e28356c488..eaba0dd6c7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -61,8 +61,8 @@ [%- IF account.description %], [% account.description | html %][% END %] [% account.item.barcode | html %] - [% account.issue.date_due | $KohaDates with_hours => 1 | html %] - [% account.issue.returndate | $KohaDates with_hours => 1 | html %] + [% account.issue.date_due | $KohaDates as_due_date => 1 %] + [% account.issue.returndate | $KohaDates with_hours => 1 %] [% account.note | html %] [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount | $Price %] [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding | $Price %] diff --git a/members/printinvoice.pl b/members/printinvoice.pl index 5f8e22a7cc9..49e777ef77a 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -59,8 +59,6 @@ my $accountline_object = Koha::Account::Lines->find($accountlines_id); my $accountline = $accountline_object->unblessed; $accountline->{item} = $accountline_object->item || "" ; $accountline->{issue} = $accountline_object->issue || ""; -#$accountline->{'item'} = $accountline->{itemnumber} ? $accountline_object->item : "" ; -#$accountline->{'issue'} = $accountline->{issue_id} ? $accountline_object->issue : "" ; my $totalcredit; if ( $total <= 0 ) { -- 2.11.0