X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fhistsearch.pl;h=cd3e444670485fe1f6f5dd3954eb2172b3014c78;hb=befebb8a5c7757cddd0fbb0c639ca8f909d931c9;hp=c7e3c32aaef09ed14da9fa895074816008433283;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha_gimpoz

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index c7e3c32aae..cd3e444670 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -2,6 +2,8 @@
 
 # This file is part of Koha.
 #
+# Parts copyright 2011 Catalyst IT Ltd.
+#
 # Koha is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
@@ -48,19 +50,25 @@ to filter on ended date.
 =cut
 
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::Acquisition;
-use C4::Date;
-
-my $input          = new CGI;
-my $title          = $input->param('title');
-my $author         = $input->param('author');
-my $name           = $input->param('name');
-my $from_placed_on = $input->param('fromplacedon');
-my $to_placed_on   = format_date_in_iso($input->param('toplacedon'));
+use C4::Dates;
+use C4::Debug;
+
+my $input = new CGI;
+my $title                   = $input->param( 'title');
+my $author                  = $input->param('author');
+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 $dbh = C4::Context->dbh;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -69,30 +77,56 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'group_manage', acquisition => 'order_manage', acquisition => 'order_receive' },
         debug           => 1,
     }
 );
 
-my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
-  &GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on );
-  
+my ( $from_iso, $to_iso, $d );
+if ( $d = $input->param('from') ) {
+    $from_iso = C4::Dates->new($d)->output('iso');
+}
+if ( $d = $input->param('iso') ) {
+    $to_iso = C4::Dates->new($d)->output('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,
+        name => $name,
+        from_placed_on => $from_iso,
+        to_placed_on => $to_iso,
+        basket => $basket,
+        booksellerinvoicenumber => $booksellerinvoicenumber,
+    );
+}
+
+my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
+my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
+
 $template->param(
     suggestions_loop        => $order_loop,
     total_qty               => $total_qty,
     total_qtyreceived       => $total_qtyreceived,
     total_price             => sprintf( "%.2f", $total_price ),
-    numresults              => scalar(@$order_loop),
+    numresults              => $order_loop ? scalar(@$order_loop) : undef,
     title                   => $title,
     author                  => $author,
+    isbn		    => $isbn,
     name                    => $name,
-    from_placed_on          => $from_placed_on,
-    to_placed_on            => $to_placed_on,
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-    DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+    basket                  => $basket,
+    booksellerinvoicenumber => $booksellerinvoicenumber,
+    from_placed_on          => $from_date,
+    to_placed_on            => $to_date,
+    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
+	dateformat              => C4::Dates->new()->format(),
+    debug                   => $debug || $input->param('debug') || 0,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;