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

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index c7e3c32aae..e89bcae394 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -2,6 +2,9 @@
 
 # This file is part of Koha.
 #
+# Copyright 2004 Biblibre
+# 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
@@ -11,10 +14,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
 
@@ -48,19 +50,31 @@ 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 $ean                     = $input->param('ean');
+my $basket                  = $input->param( 'basket' );
+my $basketgroupname             = $input->param('basketgroupname');
+my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
+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(
@@ -69,30 +83,59 @@ 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.
+if ($do_search) {
+    ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
+        title => $title,
+        author => $author,
+        isbn   => $isbn,
+        ean   => $ean,
+        name => $name,
+        from_placed_on => $from_iso,
+        to_placed_on => $to_iso,
+        basket => $basket,
+        booksellerinvoicenumber => $booksellerinvoicenumber,
+        basketgroupname => $basketgroupname,
+    );
+}
+
+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,
+    ean                     => $ean,
     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,
+    basketgroupname         => $basketgroupname,
+    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,
+    uc(C4::Context->preference("marcflavour")) => 1
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;