update and install hr-HR language

[koha.git] / acqui / basket.pl

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 3dd917c..5fa94f8 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -7,18 +7,18 @@
 #
 # This file is part of Koha.
 #
-# 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>.
 
 use strict;
 use warnings;
@@ -68,6 +68,7 @@ the supplier this script have to display the basket.
 my $query        = new CGI;
 our $basketno     = $query->param('basketno');
 my $booksellerid = $query->param('booksellerid');
+my $duplinbatch =  $query->param('duplinbatch');
 
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
@@ -150,47 +151,6 @@ if ( $op eq 'delete_confirm' ) {
     $template->param( delete_confirmed => 1 );
 } elsif ( !$bookseller ) {
     $template->param( NO_BOOKSELLER => 1 );
-} elsif ( $op eq 'del_basket') {
-    $template->param( delete_confirm => 1 );
-    if ( C4::Context->preference("IndependentBranches") ) {
-        my $userenv = C4::Context->userenv;
-        unless ( C4::Context->IsSuperLibrarian() ) {
-            my $validtest = ( $basket->{creationdate} eq '' )
-              || ( $userenv->{branch} eq $basket->{branch} )
-              || ( $userenv->{branch} eq '' )
-              || ( $basket->{branch}  eq '' );
-            unless ($validtest) {
-                print $query->redirect("../mainpage.pl");
-                exit 1;
-            }
-        }
-    }
-    $basket->{creationdate} = ""            unless ( $basket->{creationdate} );
-    $basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
-    my $contract = GetContract({
-        contractnumber => $basket->{contractnumber}
-    });
-    $template->param(
-        basketno             => $basketno,
-        basketname           => $basket->{'basketname'},
-        basketnote           => $basket->{note},
-        basketbooksellernote => $basket->{booksellernote},
-        basketcontractno     => $basket->{contractnumber},
-        basketcontractname   => $contract->{contractname},
-        creationdate         => $basket->{creationdate},
-        authorisedby         => $basket->{authorisedby},
-        authorisedbyname     => $basket->{authorisedbyname},
-        closedate            => $basket->{closedate},
-        deliveryplace        => $basket->{deliveryplace},
-        billingplace         => $basket->{billingplace},
-        active               => $bookseller->{'active'},
-        booksellerid         => $bookseller->{'id'},
-        name                 => $bookseller->{'name'},
-        address1             => $bookseller->{'address1'},
-        address2             => $bookseller->{'address2'},
-        address3             => $bookseller->{'address3'},
-        address4             => $bookseller->{'address4'},
-      );
 } elsif ($op eq 'export') {
     print $query->header(
         -type       => 'text/csv',
@@ -312,7 +272,7 @@ if ( $op eq 'delete_confirm' ) {
     if( $basket->{closedate} ) {
         my ($year, $month, $day) = ($basket->{closedate} =~ /(\d+)-(\d+)-(\d+)/);
         ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $bookseller->{deliverytime});
-        $estimateddeliverydate = "$year-$month-$day";
+        $estimateddeliverydate = sprintf( "%04d-%02d-%02d", $year, $month, $day );
     }
 
     # if new basket, pre-fill infos
@@ -366,7 +326,7 @@ if ( $op eq 'delete_confirm' ) {
     push @book_foot_loop, map {$_} values %foot;
 
     # Get cancelled orders
-    my @cancelledorders = GetCancelledOrders($basketno);
+    my @cancelledorders = GetOrders($basketno, { cancelled => 1 });
     my @cancelledorders_loop;
     for my $order (@cancelledorders) {
         $order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $booksellerid, ordering => 1 });
@@ -431,6 +391,7 @@ if ( $op eq 'delete_confirm' ) {
         grouped              => $basket->{basketgroupid},
         unclosable           => @orders ? 0 : 1, 
         has_budgets          => $has_budgets,
+        duplinbatch          => $duplinbatch,
     );
 }
 
@@ -456,8 +417,6 @@ sub get_order_infos {
         my $seriestitle = $order->{'seriestitle'};
         $line{'title'} .= " / $seriestitle" if $seriestitle;
         $line{'title'} .= " / $volume"      if $volume;
-    } else {
-        $line{'title'} = "Deleted bibliographic notice, can't find title.";
     }
 
     my $biblionumber = $order->{'biblionumber'};