X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fbooksellers.pl;h=0d534f43af998fe05f44880bd52ffc4c9b47a618;hb=9c002b6b68c81eb26fe68fcdf0f47e0d3de644e8;hp=54ef3297ddccd49d536cfee2168d717dc82ca582;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha_gimpoz

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 54ef3297dd..0d534f43af 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
 #script to show suppliers and orders
-#written by chris@katipo.co.nz 23/2/2000
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
 #
 # This file is part of Koha.
 #
@@ -60,8 +60,9 @@ use CGI;
 
 
 use C4::Acquisition;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Bookseller;
+use C4::Members qw/GetMember/;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -70,64 +71,73 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'vendors_manage' },
         debug           => 1,
     }
 );
 
 #parameters
 my $supplier = $query->param('supplier');
+my $id       = $query->param('id') || $query->param('supplierid');
+my @suppliers;
 
-my @suppliers = GetBookSeller($supplier);
+if ($id) {
+	push @suppliers, GetBookSellerFromId($id);
+} else {
+	@suppliers = GetBookSeller($supplier);
+}
 my $count = scalar @suppliers;
-
+if ($count == 1){
+	$template->param( supplier_name => $suppliers[0]->{'name'},
+		id => $suppliers[0]->{'id'}
+	);
+}
 # check if we have to "close" a basket before building page
-my $op     = $query->param('op');
-my $basket = $query->param('basketno');
-if ( $op eq 'close' ) {
-    CloseBasket($basket);
+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 $toggle = 0;
 my @loop_suppliers;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $orders  = GetPendingOrders( $suppliers[$i]->{'id'}, "grouped" );
+    my $orders  = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
     my $ordcount = scalar @$orders;
     my %line;
-    if ( $toggle == 0 ) {
-        $line{even} = 1;
-        $toggle = 1;
-    } else {
-        $line{even} = 0;
-        $toggle = 0;
-    }
+
     $line{supplierid} = $suppliers[$i]->{'id'};
     $line{name}       = $suppliers[$i]->{'name'};
     $line{active}     = $suppliers[$i]->{'active'};
     my @loop_basket;
+    my $uid = GetMember($loggedinuser)->{userid} if $loggedinuser;
     for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
-        my %inner_line;
-        $inner_line{basketno}     = $orders->[$i2]{'basketno'};
-        $inner_line{total}        = $orders->[$i2]{'count(*)'};
-        $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
-        $inner_line{surname}      = $orders->[$i2]{'firstname'};
-        $inner_line{firstname}    = $orders->[$i2]{'surname'};
-        $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
-        $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} );
-        push @loop_basket, \%inner_line;
+        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'});
+            $inner_line{surname}      = $authby->{'firstname'};
+            $inner_line{firstname}    = $authby->{'surname'};
+            $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
+            $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
+            $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'};
+            push @loop_basket, \%inner_line;
+        }
     }
     $line{loop_basket} = \@loop_basket;
     push @loop_suppliers, \%line;
 }
 $template->param(
     loop_suppliers          => \@loop_suppliers,
-    supplier                => $supplier,
+    supplier                => ($id || $supplier),
     count                   => $count,
-    intranetcolorstylesheet =>
-    C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;