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

(-)C4/Acquisition.pm (-1 / +1 lines)
Lines 867-873 sub CanUserReceiveOrder { Link Here
867
867
868
    my $branch = C4::Context->userenv->{'branch'};
868
    my $branch = C4::Context->userenv->{'branch'};
869
869
870
    unless ($userflags->{superlibrarian}
870
    unless (C4::Context->IsSuperLibrarian()
871
    || (!ref $userflags->{acquisition} && $userflags->{acquisition})
871
    || (!ref $userflags->{acquisition} && $userflags->{acquisition})
872
    || (ref $userflags->{acquisition} && $userflags->{acquisition}->{order_receive_all}) )
872
    || (ref $userflags->{acquisition} && $userflags->{acquisition}->{order_receive_all}) )
873
    {
873
    {
(-)installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
Lines 8609-8615 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
8609
        INSERT INTO permissions (module_bit, code, description)
8609
        INSERT INTO permissions (module_bit, code, description)
8610
          VALUES (11, 'order_receive_all', 'Receive all orders')
8610
          VALUES (11, 'order_receive_all', 'Receive all orders')
8611
    ");
8611
    ");
8612
    print "Upgrade to $DBversion done (Add aqorders.branch and permission order_receive_all)\n";
8612
    print "Upgrade to $DBversion done (Bug 7290: Add permission order_receive_all)\n";
8613
    SetVersion($DBversion);
8613
    SetVersion($DBversion);
8614
}
8614
}
8615
8615
(-)koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 170-176 Link Here
170
            <li>
170
            <li>
171
                [% error.error_param %]
171
                [% error.error_param %]
172
                [% IF ( error.error_duplicate_barcode ) %]
172
                [% IF ( error.error_duplicate_barcode ) %]
173
                    Duplicate Barcode
173
                    Duplicate barcode
174
                [% ELSIF (error.error_cannot_receive_order) %]
174
                [% ELSIF (error.error_cannot_receive_order) %]
175
                    You were not authorised to receive this order
175
                    You were not authorised to receive this order
176
                [% END %]
176
                [% END %]
(-)t/Acquisition/CanUserReceiveBasket.t (-1 / +8 lines)
Lines 37-64 my $order3 = { Link Here
37
37
38
$userenv->{branch} = 'B1';
38
$userenv->{branch} = 'B1';
39
39
40
# User can receive any orders thanks to his permissions
40
ok( CanUserReceiveOrder($borrower, $order1, {superlibrarian => 1}) );
41
ok( CanUserReceiveOrder($borrower, $order1, {superlibrarian => 1}) );
41
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => 1}) );
42
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => 1}) );
42
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive_all => 1 }}) );
43
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive_all => 1 }}) );
43
44
45
# User cannot receive any order because of his lack of permission
44
ok( not CanUserReceiveOrder($borrower, $order1, {}) );
46
ok( not CanUserReceiveOrder($borrower, $order1, {}) );
45
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => 0}) );
47
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => 0}) );
46
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 0 }}) );
48
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 0 }}) );
47
49
50
# User with order_receive permission can receive only orders of his branch (B1)
51
# and orders that don't belong to any branch
48
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 1 }}) );
52
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 1 }}) );
49
ok( CanUserReceiveOrder($borrower, $order2, {acquisition => { order_receive => 1 }}) );
53
ok( CanUserReceiveOrder($borrower, $order2, {acquisition => { order_receive => 1 }}) );
50
ok( not CanUserReceiveOrder($borrower, $order3, {acquisition => { order_receive => 1 }}) );
54
ok( not CanUserReceiveOrder($borrower, $order3, {acquisition => { order_receive => 1 }}) );
51
55
52
$userenv->{branch} = 'B2';
56
$userenv->{branch} = 'B2';
53
57
58
# User can receive any order thanks to his permissions
54
ok( CanUserReceiveOrder($borrower, $order1, {superlibrarian => 1}) );
59
ok( CanUserReceiveOrder($borrower, $order1, {superlibrarian => 1}) );
55
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => 1}) );
60
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => 1}) );
56
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive_all => 1 }}) );
61
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive_all => 1 }}) );
57
62
63
# User cannot receive any order because of his lack of permission
58
ok( not CanUserReceiveOrder($borrower, $order1, {}) );
64
ok( not CanUserReceiveOrder($borrower, $order1, {}) );
59
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => 0}) );
65
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => 0}) );
60
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 0 }}) );
66
ok( not CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 0 }}) );
61
67
68
# User with order_receive permission can receive only orders of his branch (B2)
69
# and orders that don't belong to any branch
62
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 1 }}) );
70
ok( CanUserReceiveOrder($borrower, $order1, {acquisition => { order_receive => 1 }}) );
63
ok( not CanUserReceiveOrder($borrower, $order2, {acquisition => { order_receive => 1 }}) );
71
ok( not CanUserReceiveOrder($borrower, $order2, {acquisition => { order_receive => 1 }}) );
64
ok( CanUserReceiveOrder($borrower, $order3, {acquisition => { order_receive => 1 }}) );
72
ok( CanUserReceiveOrder($borrower, $order3, {acquisition => { order_receive => 1 }}) );
65
- 

Return to bug 7290