From c8c70840b4e67ffda7faecabd7532301a4ece583 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Thu, 5 Jan 2012 08:54:43 +1300 Subject: [PATCH] [SIGNED-OFF] Bug 7402 : Fixing the date formatting so links to the invoice page work This depends on bug 929 Signed-off-by: Katrin Fischer Uses the new TT plugin to display the date, while using iso format to build a correct URL to the invoice page. --- C4/Acquisition.pm | 2 -- .../prog/en/modules/acqui/histsearch.tt | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 2814977..5c4faea 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1676,8 +1676,6 @@ sub GetHistory { $line->{count} = $cnt++; $line->{toggle} = 1 if $cnt % 2; push @order_loop, $line; - $line->{creationdate} = format_date( $line->{creationdate} ); - $line->{datereceived} = format_date( $line->{datereceived} ); $total_qty += $line->{'quantity'}; $total_qtyreceived += $line->{'quantityreceived'}; $total_price += $line->{'quantity'} * $line->{'ecost'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 9321cf9..3385fb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search Results[% ELSE %]Order search[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -86,8 +87,8 @@ [% suggestions_loo.title |html %]
[% suggestions_loo.author %]
[% suggestions_loo.isbn %] [% suggestions_loo.name %] - [% suggestions_loo.creationdate %] - [% suggestions_loo.datereceived %] + [% suggestions_loo.creationdate | $KohaDates %] + [% suggestions_loo.datereceived | $KohaDates %] [% suggestions_loo.quantity %] [% suggestions_loo.ecost %] -- 1.7.5.4