From 1a97c835e98fc1823eb6d1a315c6c29089d648f3 Mon Sep 17 00:00:00 2001 From: Adrien Saurat <adrien.saurat@biblibre.com> Date: Mon, 19 Mar 2012 14:56:44 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 7737: use of date filter on bookseller pages Content-Type: text/plain; charset="utf-8" Implements the TT filter on bookseller.pl and supplier.pl Signed-off-by: mveron <veron@veron.ch> --- acqui/booksellers.pl | 6 ------ acqui/supplier.pl | 6 ------ .../prog/en/modules/acqui/booksellers.tt | 5 +++-- .../prog/en/modules/acqui/supplier.tt | 5 +++-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index ac3c557..18c8e5e 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -56,7 +56,6 @@ use C4::Biblio; use C4::Output; use CGI; -use C4::Dates qw/format_date/; use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /; use C4::Members qw/GetMember/; use C4::Context; @@ -120,11 +119,6 @@ for my $vendor (@suppliers) { ) ) ) { - for my $date_field (qw( creationdate closedate)) { - if ( $basket->{$date_field} ) { - $basket->{$date_field} = format_date( $basket->{$date_field} ); - } - } push @{$loop_basket}, $basket; } } diff --git a/acqui/supplier.pl b/acqui/supplier.pl index fdeef06..6746d8d 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -46,7 +46,6 @@ use C4::Auth; use C4::Contract qw/GetContract/; use C4::Biblio; use C4::Output; -use C4::Dates qw/format_date /; use CGI; use C4::Bookseller qw( GetBookSellerFromId DelBookseller ); @@ -79,11 +78,6 @@ if ( $op eq 'display' ) { my $contracts = GetContract( { booksellerid => $booksellerid } ); - for ( @{$contracts} ) { - $_->{contractstartdate} = format_date( $_->{contractstartdate} ); - $_->{contractenddate} = format_date( $_->{contractenddate} ); - } - $template->param( booksellerid => $booksellerid, name => $supplier->{'name'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1616261..cf74042 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Search for vendor [% supplier %]</title> [% INCLUDE 'doc-head-close.inc' %] @@ -97,9 +98,9 @@ <td> [% loop_baske.firstname %] [% loop_baske.surname %] </td> - <td>[% loop_baske.creationdate %]</td> + <td>[% loop_baske.creationdate | $KohaDates %]</td> <td> [% IF ( loop_baske.closedate ) %] - closed on [% loop_baske.closedate %] + closed on [% loop_baske.closedate | $KohaDates %] <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_baske.basketno %]">View</a> [% ELSE %] [% IF ( loop_baske.active ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 05b7fac..7260f55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Vendor [% bookselname %]</title> [% INCLUDE 'doc-head-close.inc' %] @@ -217,8 +218,8 @@ if (f.company.value == "") { <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a> </td> <td>[% contract.contractdescription %]</td> - <td>[% contract.contractstartdate %]</td> - <td>[% contract.contractenddate %]</td> + <td>[% contract.contractstartdate | $KohaDates %]</td> + <td>[% contract.contractenddate | $KohaDates %]</td> <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]">Edit</a></td> <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]">Delete</a></td> </tr> -- 1.7.2.5