From 1d9245d7b21f1bd0b403940e12156ff364a8f6e8 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Mon, 19 Feb 2018 20:49:02 +0000
Subject: [PATCH] Bug 12001: (QA follow-up) Fix printinvoice page

Test plan:
Try to print a fee
--> without patch it explodes
--> with patch it works and the date is formatted according to
system wide date format setting

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/modules/members/printinvoice.tt      | 3 ++-
 members/printinvoice.pl                                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 62fb69d5ab..151d9456de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
@@ -1,5 +1,6 @@
 [% USE Koha %]
 [% USE Branches %]
+[% USE KohaDates %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print receipt for [% patron.cardnumber %]</title>
@@ -45,7 +46,7 @@
 
   [% FOREACH account IN accounts %]
 <tr class="highlight">
-      <td>[% account.date %]</td>
+      <td>[% account.date | $KohaDates%]</td>
        <td>
         [% SWITCH account.accounttype %]
           [% CASE 'Pay' %]Payment, thanks
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index a75b0a629e..5988325915 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -80,7 +80,7 @@ if ( $accountline->{'amountoutstanding'} <= 0 ) {
 }
 
 my %row = (
-    'date'                    => dt_from_string( $accountline->{'date'}, dateonly => 1 ),
+    'date'                    => dt_from_string( $accountline->{'date'} ),
     'amountcredit'            => $accountline->{'amountcredit'},
     'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
     'description'             => $accountline->{'description'},
-- 
2.39.5