From 7fba4e3ef81a1b6ea0699107f9bde2f54d299b72 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 17 Apr 2014 09:40:25 -0400 Subject: [PATCH] Bug 12089: Remove use of dt_add_type_uk_date() - Acquisitions This patch removes instances of dt_add_type_uk_date() from acquisitions templates and updates sorting configurations according to current guidelines. In cases where a formatted date was passed from a Perl script, the script has been modified to pass an unformatted date. Several instances of the no longer valid align attribute have been removed from tags in favor of an existing "data" class which is suitable for display of currency values. To test, view the following pages in Acquisitions. Columns containing dates should sort correctly regardless of dateformat system preference setting. Columns containing bibliographic titles should ignore articles when sorting. - Add to an order from a staged file: The table of staged files should sort correctly. After clicking "add orders" for one of the staged files, the table of titles in that staged file should also be sorted correctly. - Add to an order from a subscription. The table of subscription search results should sort correctly. - Orders search results should sort correctly. - Late orders should sort correctly. - Search for a vendor. Click on the vendor name to view the vendor detail page. The table of contracts on this page should sort correctly. - From the Acquisitions home page click a number in the "spent" column of the table of available funds. The table of orders should sort correctly. - From the Acquisitions home page click a number in the "ordered" column of the table of available funds. The table of orders should sort correctly. - From a vendor detail page, click the "Receive shipments" button. On the receive shipments page the table of shipments should be sorted correctly. Signed-off-by: David Cook Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton --- C4/Acquisition.pm | 2 - acqui/parcels.pl | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 24 ++++++------ .../prog/en/modules/acqui/histsearch.tt | 21 ++++++----- .../prog/en/modules/acqui/lateorders.tt | 30 +++++++++------ .../en/modules/acqui/newordersubscription.tt | 23 ++++++------ .../prog/en/modules/acqui/ordered.tt | 27 +++++++------- .../prog/en/modules/acqui/parcels.tt | 10 ++--- .../prog/en/modules/acqui/spent.tt | 37 ++++++++++--------- .../prog/en/modules/acqui/supplier.tt | 20 +++------- 10 files changed, 99 insertions(+), 97 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index f7c1d235d5..a14ffe72bf 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2191,8 +2191,6 @@ sub GetLateOrders { $sth->execute(@query_params); my @results; while (my $data = $sth->fetchrow_hashref) { - $data->{orderdate} = format_date($data->{orderdate}); - $data->{claimed_date} = format_date($data->{claimed_date}); push @results, $data; } return @results; diff --git a/acqui/parcels.pl b/acqui/parcels.pl index df02e21c7c..3565d6d033 100755 --- a/acqui/parcels.pl +++ b/acqui/parcels.pl @@ -169,7 +169,7 @@ for my $i ( $startfrom .. $last_row) { nullcode => $p->{invoicenumber} eq 'NULL', emptycode => $p->{invoicenumber} eq q{}, raw_datereceived => $p->{shipmentdate}, - datereceived => format_date( $p->{shipmentdate} ), + datereceived => $p->{shipmentdate}, bibcount => $p->{receivedbiblios} || 0, reccount => $p->{receiveditems} || 0, itemcount => $p->{itemsexpected} || 0, 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 149d532313..fafa114342 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -14,16 +14,12 @@