X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fhistsearch.pl;h=e9e40098e38744b3f505c808dc4ea3f7a9e0e16c;hb=8a2b3bc0c89e265cd48c5482523ddeb36543d3d5;hp=44921be7a29dd35a373fd95bdcba4ada59058cb5;hpb=367c4fb8815bfe4a01869a25bcd8222989c15dcd;p=koha_fer

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 44921be7a2..e9e40098e3 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -2,6 +2,7 @@
 
 # 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
@@ -13,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
 
@@ -57,17 +57,24 @@ use C4::Output;
 use C4::Acquisition;
 use C4::Dates;
 use C4::Debug;
+use C4::Branch;
+use C4::Koha;
 
 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'));
+my $budget                  = $input->param( 'budget' );
+my $orderstatus             = $input->param( 'orderstatus' );
+
 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);
@@ -81,7 +88,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 'group_manage', acquisition => 'order_manage', acquisition => 'order_receive' },
+        flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
 );
@@ -101,19 +108,33 @@ if ($do_search) {
         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,
+        budget => $budget,
+        orderstatus => $orderstatus,
     );
 }
 
 my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
 my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
 
+my $budgetperiods = C4::Budgets::GetBudgetPeriods;
+my $bp_loop = $budgetperiods;
+for my $bp ( @{$budgetperiods} ) {
+    my $hierarchy = C4::Budgets::GetBudgetHierarchy( $$bp{budget_period_id} );
+    for my $budget ( @{$hierarchy} ) {
+        $$budget{budget_display_name} = sprintf("%s", ">" x $$budget{depth} . $$budget{budget_name});
+    }
+    $$bp{hierarchy} = $hierarchy;
+}
+
 $template->param(
-    suggestions_loop        => $order_loop,
+    order_loop              => $order_loop,
     total_qty               => $total_qty,
     total_qtyreceived       => $total_qtyreceived,
     total_price             => sprintf( "%.2f", $total_price ),
@@ -121,14 +142,16 @@ $template->param(
     title                   => $title,
     author                  => $author,
     isbn                    => $isbn,
+    ean                     => $ean,
     name                    => $name,
     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(),
+    bp_loop                 => $bp_loop,
     debug                   => $debug || $input->param('debug') || 0,
+    uc(C4::Context->preference("marcflavour")) => 1
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;