Bugzilla – Attachment 35100 Details for
Bug 4402
Date filter in parcels.tt requires db format dates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 4402: Date filter on parcels.tt required db date format
Bug-4402-Date-filter-on-parcelstt-required-db-date.patch (text/plain), 3.03 KB, created by
Jonathan Druart
on 2015-01-12 08:48:15 UTC
(
hide
)
Description:
Bug 4402: Date filter on parcels.tt required db date format
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-01-12 08:48:15 UTC
Size:
3.03 KB
patch
obsolete
>From 9754f16f79f8cba41d545c298bac6c81171e9a7b Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 6 Jan 2015 16:35:48 +0100 >Subject: [PATCH] Bug 4402: Date filter on parcels.tt required db date format > >The date filters on the parcel page would only work with >dates formatted YYYY-MM-DD. > >To test: >- Select a vendor, that already has a few invoices >- "Receive shipment" - you are on the parcels page >- Use the From and To filters on the left, notice there > is now a date picker on those fields >- Verify the search works correctly for different date > formats >--- > acqui/parcels.pl | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/acqui/parcels.pl b/acqui/parcels.pl >index e3b8f5f..3073507 100755 >--- a/acqui/parcels.pl >+++ b/acqui/parcels.pl >@@ -72,11 +72,11 @@ use CGI; > use C4::Auth; > use C4::Output; > >-use C4::Dates qw/format_date/; > use C4::Acquisition; > use C4::Budgets; > > use Koha::Acquisition::Bookseller; >+use Koha::DateUtils qw( dt_from_string ); > > my $input = CGI->new; > my $booksellerid = $input->param('booksellerid'); >@@ -145,8 +145,8 @@ my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid }); > my @parcels = GetInvoices( > supplierid => $booksellerid, > invoicenumber => $code, >- shipmentdatefrom => $datefrom, >- shipmentdateto => $dateto, >+ ( $datefrom ? ( shipmentdatefrom => dt_from_string($datefrom) ) : () ), >+ ( $dateto ? ( shipmentdateto => dt_from_string($dateto)) : () ), > order_by => $order > ); > my $count_parcels = @parcels; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 147a26f..ff2e3d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -209,8 +209,8 @@ > <ol> > <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li> > <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li> >- <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br /> >- <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li> >+ <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | $KohaDates %]" class="datepicker" /><br /> >+ <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto | $KohaDates %]" class="datepicker" /></li> > <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby"> > <option value="invoicenumber">Invoice number</option> > <option value="shipmentdate">Shipment date</option> >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4402
:
34989
|
34990
|
34993
|
35100
|
35101
|
35151
|
36402
|
36549