Bug 19813: Make MarcItemFieldsToOrder handle non-existing tags

[koha.git] / acqui / histsearch.pl

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 5bc5404..9261379 100755 (executable)
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -5,18 +5,18 @@
 # 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
 
@@ -55,10 +55,9 @@ 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::Branch;
 use C4::Koha;
+use Koha::DateUtils;
 
 my $input = new CGI;
 my $title                   = $input->param( 'title');
@@ -70,17 +69,17 @@ 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' );
 my $ordernumber             = $input->param( 'ordernumber' );
 my $search_children_too     = $input->param( 'search_children_too' );
+my @created_by              = $input->multi_param('created_by');
 
-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 $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;
@@ -95,14 +94,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-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;
 # If we're supplied any value then we do a search. Otherwise we don't.
 if ($do_search) {
@@ -112,8 +103,8 @@ if ($do_search) {
         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,
@@ -121,12 +112,10 @@ if ($do_search) {
         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} ) {
@@ -150,8 +139,8 @@ $template->param(
     basketgroupname         => $basketgroupname,
     ordernumber             => $ordernumber,
     search_children_too     => $search_children_too,
-    from_placed_on          => $from_date,
-    to_placed_on            => $to_date,
+    from_placed_on          => $from_placed_on,
+    to_placed_on            => $to_placed_on,
     orderstatus             => $orderstatus,
     budget_id               => $budget,
     bp_loop                 => $bp_loop,