X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fserials-collection.pl;h=2179b8306998eba0dc5aefd8c364f9041aeef4fc;hb=178e40ae9fd7246fa638a64c34fde06f94548ff0;hp=e36e50e0f833895161f77af8348da3753620c2a6;hpb=9f4b54a6d74b9635195bb9ea0b9c11fe5570cf6e;p=srvgit

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index e36e50e0f8..2179b83069 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -21,20 +21,18 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Koha;
-use C4::Serials;
-use C4::Letters;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Serials qw( ModSerialStatus GetSubscription GetNextExpected GetNextSeq GetNextDate NewIssue HasSubscriptionExpired abouttoexpire check_routing GetFullSubscription PrepareSerialsData CountSubscriptionFromBiblionumber GetSubscriptionsFromBiblionumber GetFullSubscriptionsFromBiblionumber );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
 use C4::Context;
 use Koha::Serial::Items;
 
 use Koha::DateUtils qw( dt_from_string );
 
-use List::MoreUtils qw/uniq/;
+use List::MoreUtils qw( uniq );
 
 
-my $query = new CGI;
+my $query = CGI->new;
 my $op = $query->param('op') || q{};
 my $nbissues=$query->param('nbissues');
 my $date_received_today = $query->param('date_received_today') || 0;
@@ -45,7 +43,6 @@ my ($template, $loggedinuser, $cookie)
                             query => $query,
                             type => "intranet",
                             flagsrequired => {serials => '*'},
-                            debug => 1,
                             });
 my $biblionumber = $query->param('biblionumber');
 my @subscriptionid = $query->multi_param('subscriptionid');
@@ -119,12 +116,16 @@ if($op eq 'delete_confirm'){
     }
 }elsif($op eq 'delete_confirmed'){
     if($query->param('delitems') eq "Yes"){
+        my @itemnumbers;
         foreach my $serialid (@serialsid){
-            my @itemnumbers = Koha::Serial::Items->search({serialid => $serialid})->get_column('itemnumber');
-            foreach my $itemnumber (@itemnumbers){
-                my $delcheck = C4::Items::DelItemCheck($biblionumber, $itemnumber);
-                $template->param(error_delitem => 1) if $delcheck != 1;
-            }
+            my @ids = Koha::Serial::Items->search({serialid => $serialid})->get_column('itemnumber');
+            push(@itemnumbers, @ids);
+        }
+        my $items = Koha::Items->search({ itemnumber => \@itemnumbers });
+        while ( my $item = $items->next ) {
+            my $deleted = $item->safe_delete;
+            $template->param(error_delitem => 1)
+                unless $deleted;
         }
     }
     for my $serialid (@serialsid){