Bug 30952: Show the search catalog form by default in cat-search.inc

[koha-ffzg.git] / admin / aqcontract.pl

diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 8916087..def0339 100755 (executable)
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -23,10 +23,16 @@
 use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Contract;
-use Koha::DateUtils;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Contract qw(
+    AddContract
+    DelContract
+    GetContract
+    GetContracts
+    ModContract
+);
+use Koha::DateUtils qw( dt_from_string );
 
 use Koha::Acquisition::Booksellers;
 
@@ -90,8 +96,8 @@ elsif ( $op eq 'add_validate' ) {
 
     my $is_a_modif = $input->param("is_a_modif");
 
-    my $contractstart_dt = eval { dt_from_string( scalar $input->param('contractstartdate') ); };
-    my $contractend_dt = eval { dt_from_string( scalar $input->param('contractenddate') ); };
+    my $contractstart_dt = $input->param('contractstartdate');
+    my $contractend_dt = $input->param('contractenddate');
     unless ( $contractstart_dt and $contractend_dt ) {
         my $today = dt_from_string;
         $contractstart_dt ||= $today;
@@ -100,8 +106,8 @@ elsif ( $op eq 'add_validate' ) {
 
     if ( $is_a_modif ) {
         ModContract({
-            contractstartdate   => eval { output_pref({ dt => dt_from_string( $contractstart_dt ), dateformat => 'iso', dateonly => 1 } ); },
-            contractenddate     => eval { output_pref({ dt => dt_from_string( $contractend_dt ), dateformat => 'iso', dateonly => 1 } ); },
+            contractstartdate   => $contractstart_dt,
+            contractenddate     => $contractend_dt,
             contractname        => scalar $input->param('contractname'),
             contractdescription => scalar $input->param('contractdescription'),
             booksellerid        => scalar $input->param('booksellerid'),
@@ -112,8 +118,8 @@ elsif ( $op eq 'add_validate' ) {
             contractname        => scalar $input->param('contractname'),
             contractdescription => scalar $input->param('contractdescription'),
             booksellerid        => scalar $input->param('booksellerid'),
-            contractstartdate   => eval { output_pref({ dt => dt_from_string( scalar $input->param('contractstartdate') ), dateformat => 'iso', dateonly => 1 } ); },
-            contractenddate     => eval { output_pref({ dt => dt_from_string( scalar $input->param('contractenddate') ), dateformat => 'iso', dateonly => 1 } ); },
+            contractstartdate   => scalar $input->param('contractstartdate'),
+            contractenddate     => scalar $input->param('contractenddate'),
         });
     }
 
@@ -159,12 +165,6 @@ if ( $op eq 'list' ) {
     # get contracts
     my @contracts = @{GetContracts( { booksellerid => $booksellerid } )};
 
-    # format dates
-    for my $contract ( @contracts ) {
-        $contract->{contractstartdate} =  output_pref({ dt => dt_from_string( $contract->{contractstartdate} ), dateonly => 1 });
-        $contract->{contractenddate}   =  output_pref({ dt => dt_from_string( $contract->{contractenddate} ), dateonly => 1 }),
-    }
-
     $template->param(loop => \@contracts);
 
     #---- END $OP eq DEFAULT