X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fbooksellers.pl;h=7641e689e6dbf17608b4d34d296d3a06c3b2bb11;hb=c1e379203319c6120c8efee626d63ed005cb1090;hp=accf642e67cf2607abf430572ada8c84879df939;hpb=2de0c38671db99feea239ff147eb21bc2064b218;p=koha.git

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index accf642e67..7641e689e6 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.
 #
@@ -16,11 +16,10 @@
 # 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.
 
-# $Id$
 
 =head1 NAME
 
@@ -54,16 +53,17 @@ 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;
 use CGI;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
+
+
 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(
@@ -72,68 +72,63 @@ 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;
-
-# check if we have to "close" a basket before building page
-my $op     = $query->param('op');
-my $basket = $query->param('basket');
-if ( $op eq 'close' ) {
-    CloseBasket($basket);
+if ($count == 1){
+	$template->param( supplier_name => $suppliers[0]->{'name'},
+		id => $suppliers[0]->{'id'}
+	);
 }
 
 #build result page
-my $toggle = 0;
 my @loop_suppliers;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $orders  = GetPendingOrders( $suppliers[$i]->{'id'} );
+    my $orders  = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
     my $ordcount = scalar @$orders;
-# FIXME : $ordcount seems to be equals to 0 each times...
-
     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(borrowernumber => $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(borrowernumber => $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;