View | Details | Raw Unified | Return to bug 6390
Collapse All | Expand All

(-)a/acqui/booksellers.pl (-8 / +20 lines)
Lines 59-64 use CGI; Link Here
59
use C4::Dates qw/format_date/;
59
use C4::Dates qw/format_date/;
60
use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
60
use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
61
use C4::Members qw/GetMember/;
61
use C4::Members qw/GetMember/;
62
use C4::Context;
62
63
63
my $query = CGI->new;
64
my $query = CGI->new;
64
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
65
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 95-100 if ($loggedinuser) { Link Here
95
    $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
96
    $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
96
}
97
}
97
98
99
my $userenv = C4::Context::userenv;
100
my $viewbaskets = C4::Context->preference('AcqViewBaskets');
101
102
my $userbranch = $userenv->{branch};
103
98
#build result page
104
#build result page
99
my $loop_suppliers = [];
105
my $loop_suppliers = [];
100
106
Lines 102-120 for my $vendor (@suppliers) { Link Here
102
    my $baskets = get_vendors_baskets( $vendor->{id} );
108
    my $baskets = get_vendors_baskets( $vendor->{id} );
103
109
104
    my $loop_basket = [];
110
    my $loop_basket = [];
111
    
105
    for my $basket ( @{$baskets} ) {
112
    for my $basket ( @{$baskets} ) {
106
        if ((      $basket->{authorisedby}
113
        my $authorisedby = $basket->{authorisedby};
107
                && $basket->{authorisedby} eq $loggedinuser
114
        my $basketbranch = GetMember( borrowernumber => $authorisedby )->{branchcode};
108
            )
115
        
109
            || haspermission( $uid, { acquisition => q{*} } )
116
        if ($userenv->{'flags'} & 1 || #user is superlibrarian
110
          ) {
117
               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
118
                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
119
                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
120
                   ($basket->{authorisedby} &&  $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
121
                   ) 
122
                ) 
123
           ) { 
111
            for my $date_field (qw( creationdate closedate)) {
124
            for my $date_field (qw( creationdate closedate)) {
112
                if ( $basket->{$date_field} ) {
125
                if ( $basket->{$date_field} ) {
113
                    $basket->{$date_field} =
126
                    $basket->{$date_field} = format_date( $basket->{$date_field} );
114
                      format_date( $basket->{$date_field} );
115
                }
127
                }
116
            }
128
            }
117
            push @{$loop_basket}, $basket;
129
            push @{$loop_basket}, $basket; 
118
        }
130
        }
119
    }
131
    }
120
132
(-)a/admin/systempreferences.pl (+1 lines)
Lines 76-81 my %tabsysprefs; Link Here
76
    $tabsysprefs{AcqCreateItem}="Acquisitions";
76
    $tabsysprefs{AcqCreateItem}="Acquisitions";
77
    $tabsysprefs{OrderPdfFormat}="Acquisitions";
77
    $tabsysprefs{OrderPdfFormat}="Acquisitions";
78
    $tabsysprefs{CurrencyFormat}="Acquisitions";
78
    $tabsysprefs{CurrencyFormat}="Acquisitions";
79
    $tabsysprefs{AcqViewBaskets}="Acquisitions";
79
80
80
# Admin
81
# Admin
81
$tabsysprefs{singleBranchMode}      = "Admin";
82
$tabsysprefs{singleBranchMode}      = "Admin";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +7 lines)
Lines 16-21 Acquisitions: Link Here
16
              1: always ask for confirmation.
16
              1: always ask for confirmation.
17
              2: do not ask for confirmation.
17
              2: do not ask for confirmation.
18
    -
18
    -
19
        - Show baskets
20
        - pref: AcqViewBaskets
21
          choices:
22
              user: created by staff member.
23
              branch: from staff member's branch.
24
              all: in system, regardless of owner.
25
    -
19
        - Display currencies using the following format 
26
        - Display currencies using the following format 
20
        - pref: CurrencyFormat
27
        - pref: CurrencyFormat
21
          choices:
28
          choices:
22
- 

Return to bug 6390