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

(-)a/acqui/booksellers.pl (-8 / +12 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 90-112 if ( $supplier_count == 1 ) { Link Here
90
    );
91
    );
91
}
92
}
92
93
93
my $uid;
94
my $userenv = C4::Context::userenv;
94
if ($loggedinuser) {
95
my $viewbaskets = C4::Context->preference('AcqViewBaskets');
95
    $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
96
96
}
97
my $userbranch = $userenv->{branch};
97
98
98
#build result page
99
#build result page
99
my $loop_suppliers = [];
100
my $loop_suppliers = [];
100
101
102
my %branchcache;
103
101
for my $vendor (@suppliers) {
104
for my $vendor (@suppliers) {
102
    my $baskets = get_vendors_baskets( $vendor->{id} );
105
    my $baskets = get_vendors_baskets( $vendor->{id} );
103
106
104
    my $loop_basket = [];
107
    my $loop_basket = [];
105
    for my $basket ( @{$baskets} ) {
108
    for my $basket ( @{$baskets} ) {
106
        if ((      $basket->{authorisedby}
109
        my $authorisedby = $basket->{authorisedby};
107
                && $basket->{authorisedby} eq $loggedinuser
110
        if ($authorisedby && $authorisedby == $loggedinuser
108
            )
111
            || $viewbaskets eq 'all'
109
            || haspermission( $uid, { flagsrequired => { acquisition => q{*} } } )
112
            || $viewbaskets eq 'branch' && $authorisedby &&
113
               ($branchcache{$authorisedby} || ($branchcache{$authorisedby} = GetMember( borrowernumber => $authorisedby )->{branchcode})) eq $userbranch
110
          ) {
114
          ) {
111
            for my $date_field (qw( creationdate closedate)) {
115
            for my $date_field (qw( creationdate closedate)) {
112
                if ( $basket->{$date_field} ) {
116
                if ( $basket->{$date_field} ) {
(-)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
        - Allow a user to view baskets created
20
        - pref: AcqViewBaskets
21
          choices:
22
              user: by him only
23
              branch: at his branch
24
              all: by anyone
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