Bug 7301: 'From' field is 1 year ago by default

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index cd3e444..44921be 100755 (executable)
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -61,14 +61,18 @@ use C4::Debug;
 my $input = new CGI;
 my $title                   = $input->param( 'title');
 my $author                  = $input->param('author');
-my $isbn                   = $input->param('isbn');
+my $isbn                    = $input->param('isbn');
 my $name                    = $input->param( 'name' );
 my $basket                  = $input->param( 'basket' );
 my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
-my $from_placed_on          = $input->param('from');
-$from_placed_on             = C4::Dates->new($from_placed_on) if $from_placed_on;
-my $to_placed_on            = $input->param('to');
-$to_placed_on               = C4::Dates->new($to_placed_on) if $to_placed_on;
+my $do_search               = $input->param('do_search') || 0;
+my $from_placed_on          = C4::Dates->new($input->param('from'));
+my $to_placed_on            = C4::Dates->new($input->param('to'));
+if ( not $input->param('from') ) {
+    # FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?
+    # We would use a function like Add_Delta_YM(-1, 0, 0);
+    $$from_placed_on{dmy_arrayref}[5] -= 1;
+}
 
 my $dbh = C4::Context->dbh;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -92,13 +96,11 @@ if ( $d = $input->param('iso') ) {
 
 my ( $order_loop, $total_qty, $total_price, $total_qtyreceived );
 # If we're supplied any value then we do a search. Otherwise we don't.
-my $do_search = $title || $author || $isbn || $name || $basket || $booksellerinvoicenumber ||
-    $from_placed_on || $to_placed_on;
 if ($do_search) {
     ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
         title => $title,
         author => $author,
-       isbn   => $isbn,
+        isbn   => $isbn,
         name => $name,
         from_placed_on => $from_iso,
         to_placed_on => $to_iso,
@@ -118,14 +120,14 @@ $template->param(
     numresults              => $order_loop ? scalar(@$order_loop) : undef,
     title                   => $title,
     author                  => $author,
-    isbn                   => $isbn,
+    isbn                    => $isbn,
     name                    => $name,
     basket                  => $basket,
     booksellerinvoicenumber => $booksellerinvoicenumber,
     from_placed_on          => $from_date,
     to_placed_on            => $to_date,
     DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
-       dateformat              => C4::Dates->new()->format(),
+    dateformat              => C4::Dates->new()->format(),
     debug                   => $debug || $input->param('debug') || 0,
 );
 

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 2b52dd7..fb6982d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -57,6 +57,7 @@
                </li>
                </ol>
        </fieldset>
+    <input type="hidden" name="do_search" value="1" />
        <fieldset class="action"><input type="submit" value="Search" /></fieldset>
        </form>[% END %]
        [% IF ( suggestions_loop ) %]<h1>Search Results</h1>