X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fbooksellers.pl;h=634eb93d576fb3dd2e035db5eec3923f32423778;hb=c0234dd9b9649063acf2617fecf5c6efda38a532;hp=cc5c08450869d3ee4ce8a05d50a6c11cf17f1652;hpb=36efd0d4d0cfe5bbdcd9a4b48e0e417a59aaa63a;p=koha_gimpoz

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index cc5c084508..634eb93d57 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -59,6 +59,7 @@ use CGI;
 use C4::Dates qw/format_date/;
 use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
 use C4::Members qw/GetMember/;
+use C4::Context;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -95,6 +96,11 @@ if ($loggedinuser) {
     $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
 }
 
+my $userenv = C4::Context::userenv;
+my $viewbaskets = C4::Context->preference('AcqViewBaskets');
+
+my $userbranch = $userenv->{branch};
+
 #build result page
 my $loop_suppliers = [];
 
@@ -102,19 +108,29 @@ for my $vendor (@suppliers) {
     my $baskets = get_vendors_baskets( $vendor->{id} );
 
     my $loop_basket = [];
+    
     for my $basket ( @{$baskets} ) {
-        if ((      $basket->{authorisedby}
-                && $basket->{authorisedby} eq $loggedinuser
-            )
-            || haspermission( $uid, { flagsrequired => { acquisition => q{*} } } )
-          ) {
+        my $authorisedby = $basket->{authorisedby};
+        my $basketbranch = ''; # set a blank branch to start with
+        if ( GetMember( borrowernumber => $authorisedby ) ) {
+           # authorisedby may not be a valid borrowernumber; it's not foreign-key constrained!
+           $basketbranch = GetMember( borrowernumber => $authorisedby )->{branchcode};
+        }
+        
+        if ($userenv->{'flags'} & 1 || #user is superlibrarian
+               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
+                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
+                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
+                   ($basket->{authorisedby} &&  $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
+                   ) 
+                ) 
+           ) { 
             for my $date_field (qw( creationdate closedate)) {
                 if ( $basket->{$date_field} ) {
-                    $basket->{$date_field} =
-                      format_date( $basket->{$date_field} );
+                    $basket->{$date_field} = format_date( $basket->{$date_field} );
                 }
             }
-            push @{$loop_basket}, $basket;
+            push @{$loop_basket}, $basket; 
         }
     }