Merge commit 'biblibre/3.2_biblibre' into to-push

[koha_fer] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 3d0f771..6dc48f6 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -92,16 +92,6 @@ if ($count == 1){
                id => $suppliers[0]->{'id'}
        );
 }
-# check if we have to "close" a basket before building page
-if ($query->param('op') eq 'close') {
-       my $basket = $query->param('basketno');
-       $basket =~ /^\d+$/ and CloseBasket($basket);
-} elsif ($query->param('op') eq 'reopen') {
-    my $basket;
-    $basket->{basketno} = $query->param('basketno');
-    $basket->{closedate} = undef;
-    ModBasket($basket);
-}
 
 #build result page
 my @loop_suppliers;
@@ -114,9 +104,9 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     $line{name}       = $suppliers[$i]->{'name'};
     $line{active}     = $suppliers[$i]->{'active'};
     my @loop_basket;
-    my $uid = GetMember($loggedinuser)->{userid};
+    my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser;
     for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
-        if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission(C4::Context->dbh, $uid, { flagsrequired   => { 'acquisition' => '*' } } ) ) {
+        if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission($uid, { flagsrequired   => { 'acquisition' => '*' } } ) ) {
             my %inner_line;
             $inner_line{basketno}     = $orders->[$i2]{'basketno'};
             $inner_line{basketname}     = $orders->[$i2]{'basketname'};