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

(-)koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref.orig (+7 lines)
Lines 9-14 Link Here
9
              receiving: receiving an order.
9
              receiving: receiving an order.
10
              cataloguing: cataloging the record.
10
              cataloguing: cataloging the record.
11
    -
11
    -
12
        - Allow a user to view baskets created
13
        - pref: AcqViewBaskets
14
          choices:
15
              user: by him only
16
              branch: at his branch
17
              all: by anyone
18
    -
12
        - Display currencies using the following format 
19
        - Display currencies using the following format 
13
        - pref: CurrencyFormat
20
        - pref: CurrencyFormat
14
          choices:
21
          choices:
(-)admin/systempreferences.pl.orig (+1 lines)
Lines 76-81 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";
(-)acqui/booksellers.pl.orig (-8 / +16 lines)
Lines 59-64 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 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 $uid = $userenv->{id};
98
# $loggedinuser == $userenv->{number}
99
my $userbranch = $userenv->{branch};
97
100
98
#build result page
101
#build result page
99
my $loop_suppliers = [];
102
my $loop_suppliers = [];
100
103
104
my %branchcache;
105
101
for my $vendor (@suppliers) {
106
for my $vendor (@suppliers) {
102
    my $baskets = get_vendors_baskets( $vendor->{id} );
107
    my $baskets = get_vendors_baskets( $vendor->{id} );
103
108
104
    my $loop_basket = [];
109
    my $loop_basket = [];
105
    for my $basket ( @{$baskets} ) {
110
    for my $basket ( @{$baskets} ) {
106
        if ((      $basket->{authorisedby}
111
        my $authorisedby = $basket->{authorisedby};
107
                && $basket->{authorisedby} eq $loggedinuser
112
        if ($authorisedby && $authorisedby == $loggedinuser
108
            )
113
            || $viewbaskets eq 'all'
109
            || haspermission( $uid, { flagsrequired => { acquisition => q{*} } } )
114
            || $viewbaskets eq 'branch' && $authorisedby &&
115
#              GetMember( borrowernumber => $authorisedby )->{branchcode} eq $userbranch
116
               ($branchcache{$authorisedby} || ($branchcache{$authorisedby} = GetMember( borrowernumber => $authorisedby )->{branchcode})) eq $userbranch
117
#           || haspermission( $uid, { acquisition => q{*} } )
110
          ) {
118
          ) {
111
            for my $date_field (qw( creationdate closedate)) {
119
            for my $date_field (qw( creationdate closedate)) {
112
                if ( $basket->{$date_field} ) {
120
                if ( $basket->{$date_field} ) {

Return to bug 6390