From 770a25235818e581ad88bcbe5e1ecac2482a1bf3 Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Mon, 19 Mar 2012 17:10:16 +0100 Subject: [PATCH] Bug 7748: use of TT date filter on addorderiso2709 --- acqui/addorderiso2709.pl | 5 +++-- .../prog/en/modules/acqui/addorderiso2709.tt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 660d633..8d9c0e3 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -41,7 +41,6 @@ use C4::Koha; use C4::Budgets; use C4::Acquisition; use C4::Bookseller qw/GetBookSellerFromId/; -use C4::Dates; use C4::Suggestions; # GetSuggestion use C4::Branch; # GetBranches use C4::Members; @@ -343,11 +342,13 @@ sub import_batches_list { # check if there is at least 1 line still staged my $stagedList=GetImportBibliosRange($batch->{'import_batch_id'}, undef, undef, 'staged'); if (scalar @$stagedList) { + my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'}); push @list, { import_batch_id => $batch->{'import_batch_id'}, num_biblios => $batch->{'num_biblios'}, num_items => $batch->{'num_items'}, - upload_timestamp => $batch->{'upload_timestamp'}, + staged_date => $staged_date, + staged_hour => $staged_hour, import_status => $batch->{'import_status'}, file_name => $batch->{'file_name'}, comments => $batch->{'comments'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 9b85af3..3e49f1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Order Staged MARC Records [% IF ( batch_details ) %] @@ -90,7 +91,7 @@ <td>[% batch_lis.file_name %]</td> <td>[% batch_lis.comments %]</td> <td>[% batch_lis.import_status %]</td> - <td>[% batch_lis.upload_timestamp %]</td> + <td>[% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %]</td> <td>[% batch_lis.num_biblios %]</td> <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]">Add orders</a></td> </tr> -- 1.7.4.1