# 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
-# version.
+# 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 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 NAME
use strict;
#use warnings; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth; # get_template_and_user
use C4::Output;
use C4::Acquisition;
-use C4::Dates;
use C4::Debug;
+use C4::Koha;
+use Koha::DateUtils;
my $input = new CGI;
my $title = $input->param( 'title');
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 $budget = $input->param( 'budget' );
+my $orderstatus = $input->param( 'orderstatus' );
+my $ordernumber = $input->param( 'ordernumber' );
+my $search_children_too = $input->param( 'search_children_too' );
+my @created_by = $input->multi_param('created_by');
+
+my $from_placed_on = eval { dt_from_string( scalar $input->param('from') ) } || dt_from_string;
+my $to_placed_on = eval { dt_from_string( scalar $input->param('to') ) } || dt_from_string;
+unless ( $input->param('from') ) {
+ # Fill the form with year-1
+ $from_placed_on->subtract( years => 1 );
}
my $dbh = C4::Context->dbh;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "acqui/histsearch.tmpl",
+ template_name => "acqui/histsearch.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { acquisition => 'group_manage', acquisition => 'order_manage', acquisition => 'order_receive' },
+ flagsrequired => { acquisition => '*' },
debug => 1,
}
);
-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 );
+my $order_loop;
# 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(
+ $order_loop = GetHistory(
title => $title,
author => $author,
isbn => $isbn,
ean => $ean,
name => $name,
- from_placed_on => $from_iso,
- to_placed_on => $to_iso,
+ from_placed_on => output_pref( { dt => $from_placed_on, dateformat => 'iso', dateonly => 1 } ),
+ to_placed_on => output_pref( { dt => $to_placed_on, dateformat => 'iso', dateonly => 1 } ),
basket => $basket,
booksellerinvoicenumber => $booksellerinvoicenumber,
basketgroupname => $basketgroupname,
+ budget => $budget,
+ orderstatus => $orderstatus,
+ ordernumber => $ordernumber,
+ search_children_too => $search_children_too,
+ created_by => \@created_by,
);
}
-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,
- total_qty => $total_qty,
- total_qtyreceived => $total_qtyreceived,
- total_price => sprintf( "%.2f", $total_price ),
+ order_loop => $order_loop,
numresults => $order_loop ? scalar(@$order_loop) : undef,
title => $title,
author => $author,
- isbn => $isbn,
+ 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(),
+ ordernumber => $ordernumber,
+ search_children_too => $search_children_too,
+ from_placed_on => $from_placed_on,
+ to_placed_on => $to_placed_on,
+ orderstatus => $orderstatus,
+ budget_id => $budget,
+ bp_loop => $bp_loop,
+ search_done => $do_search,
debug => $debug || $input->param('debug') || 0,
uc(C4::Context->preference("marcflavour")) => 1
);
projects / koha.git / blobdiff