Bug 16154: Fix some other occurrences

[koha.git] / serials / serials-edit.pl

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 1b7d2ed..30ddc12 100755 (executable)
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -66,7 +66,6 @@ use warnings;
 use CGI qw ( -utf8 );
 use Encode qw( decode is_utf8 );
 use C4::Auth;
-use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Biblio;
 use C4::Items;
 use C4::Koha;
@@ -74,17 +73,20 @@ use C4::Output;
 use C4::Context;
 use C4::Serials;
 use C4::Search qw/enabled_staff_search_views/;
+use Koha::DateUtils;
+
 use List::MoreUtils qw/uniq/;
 
 my $query           = CGI->new();
 my $dbh             = C4::Context->dbh;
-my @serialids       = $query->param('serialid');
-my @serialseqs      = $query->param('serialseq');
-my @planneddates    = $query->param('planneddate');
-my @publisheddates  = $query->param('publisheddate');
-my @status          = $query->param('status');
-my @notes           = $query->param('notes');
-my @subscriptionids = $query->param('subscriptionid');
+my @serialids       = $query->multi_param('serialid');
+my @serialseqs      = $query->multi_param('serialseq');
+my @planneddates    = $query->multi_param('planneddate');
+my @publisheddates  = $query->multi_param('publisheddate');
+my @publisheddatetexts = $query->multi_param('publisheddatetext');
+my @status          = $query->multi_param('status');
+my @notes           = $query->multi_param('notes');
+my @subscriptionids = $query->multi_param('subscriptionid');
 my $op              = $query->param('op');
 if ( scalar(@subscriptionids) == 1 && index( $subscriptionids[0], q|,| ) > 0 ) {
     @subscriptionids = split( /,/, $subscriptionids[0] );
@@ -126,7 +128,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my @serialdatalist;
 my %processedserialid;
 
-my $today = C4::Dates->new();
+my $today = output_pref( { dt => dt_from_string, dateonly => 1 } );
+
 foreach my $serialid (@serialids) {
 
     #filtering serialid for duplication
@@ -142,10 +145,10 @@ foreach my $serialid (@serialids) {
                 $serinfo->{$d} = q{};
             }
             else {
-                $serinfo->{$d} = format_date( $serinfo->{$d} );
+                $serinfo->{$d} = output_pref( { dt => dt_from_string( $serinfo->{$d} ), dateonly => 1 } );
             }
         }
-        $serinfo->{arriveddate}=$today->output('syspref');
+        $serinfo->{arriveddate} = $today;
 
         $serinfo->{'editdisable'} = (
             (
@@ -154,6 +157,7 @@ foreach my $serialid (@serialids) {
             )
             || $serinfo->{'cannotedit'}
         );
+        $serinfo->{editdisable} = 0 if C4::Auth::haspermission( C4::Context->userenv->{id}, { serials => 'receive_serials' } );
         $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
         push @serialdatalist, $serinfo;
         $processedserialid{$serialid} = 1;
@@ -185,7 +189,7 @@ foreach my $subscriptionid (@subscriptionids) {
         $cell->{'itemid'}         = 'NNEW';
         $cell->{'serialid'}       = 'NEW';
         $cell->{'issuesatonce'}   = 1;
-        $cell->{arriveddate}=$today->output('syspref');
+        $cell->{arriveddate}      = $today;
 
         push @newserialloop, $cell;
         push @subscriptionloop,
@@ -212,10 +216,10 @@ if ( $op and $op eq 'serialchangestatus' ) {
         my ($plan_date, $pub_date);
 
         if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
-            $plan_date = format_date_in_iso( $planneddates[$i] );
+            $plan_date = eval { output_pref( { dt => dt_from_string( $planneddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
         }
         if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
-            $pub_date = format_date_in_iso( $publisheddates[$i] );
+            $pub_date = eval { output_pref( { dt => dt_from_string( $publisheddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
         }
 
         if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
@@ -230,6 +234,7 @@ if ( $op and $op eq 'serialchangestatus' ) {
                     $status[$i],
                     $plan_date,
                     $pub_date,
+                    $publisheddatetexts[$i],
                     $notes[$i]
                 );
             }
@@ -240,21 +245,22 @@ if ( $op and $op eq 'serialchangestatus' ) {
                 $serialseqs[$i],
                 $plan_date,
                 $pub_date,
+                $publisheddatetexts[$i],
                 $status[$i],
                 $notes[$i]
             );
         }
     }
-    my @moditems = $query->param('moditem');
+    my @moditems = $query->multi_param('moditem');
     if ( scalar(@moditems) ) {
-        my @tags         = $query->param('tag');
-        my @subfields    = $query->param('subfield');
-        my @field_values = $query->param('field_value');
-        my @serials      = $query->param('serial');
-        my @bibnums      = $query->param('bibnum');
-        my @itemid       = $query->param('itemid');
-        my @ind_tag      = $query->param('ind_tag');
-        my @indicator    = $query->param('indicator');
+        my @tags         = $query->multi_param('tag');
+        my @subfields    = $query->multi_param('subfield');
+        my @field_values = $query->multi_param('field_value');
+        my @serials      = $query->multi_param('serial');
+        my @bibnums      = $query->multi_param('bibnum');
+        my @itemid       = $query->multi_param('itemid');
+        my @ind_tag      = $query->multi_param('ind_tag');
+        my @indicator    = $query->multi_param('indicator');
 
         #Rebuilding ALL the data for items into a hash
         # parting them on $itemid.
@@ -392,11 +398,7 @@ if ( $op and $op eq 'serialchangestatus' ) {
         print $query->redirect($redirect);
     }
 }
-my $location = GetAuthorisedValues('LOC', $serialdatalist[0]->{'location'});
-my $locationlib;
-foreach (@$location) {
-    $locationlib = $_->{'lib'} if $_->{'selected'};
-}
+my $location = $serialdatalist[0]->{'location'};
 my $default_bib_view = get_default_view();
 
 $template->param(
@@ -407,7 +409,7 @@ $template->param(
     biblionumber    => $serialdatalist[0]->{'biblionumber'},
     serialslist     => \@serialdatalist,
     default_bib_view => $default_bib_view,
-    location         => $locationlib,
+    location         => $location,
     (uc(C4::Context->preference("marcflavour"))) => 1
 
 );