Bug5640: BZ5640 (MT3584): Nimes icon set

[koha_fer] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index e9f51a1..7641e68 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -16,9 +16,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 
 =head1 NAME
@@ -53,6 +53,7 @@ the C<basket> we have to close if op is equal to 'close'.
 =cut
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use C4::Biblio;
 use C4::Output;
@@ -92,16 +93,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,15 +105,15 @@ 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} if $loggedinuser;
+    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'};
             $inner_line{total}        = scalar GetOrders($orders->[$i2]{'basketno'});
             $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
-            my $authby = GetMember( $orders->[$i2]{'authorisedby'});
+            my $authby = GetMember(borrowernumber => $orders->[$i2]{'authorisedby'});
             $inner_line{surname}      = $authby->{'firstname'};
             $inner_line{firstname}    = $authby->{'surname'};
             $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );