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

(-)a/acqui/booksellers.pl (-1 / +1 lines)
Lines 122-128 for my $vendor (@suppliers) { Link Here
122
               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
122
               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
123
                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
123
                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
124
                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
124
                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
125
                   ($basket->{authorisedby} &&  $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket
125
                   ($basket->{authorisedby} &&  $viewbaskets eq 'user' && $authorisedby == $loggedinuser) #user created this basket
126
                   ) 
126
                   ) 
127
                ) 
127
                ) 
128
           ) { 
128
           ) { 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-9 / +14 lines)
Lines 24-29 $(document).ready(function() { Link Here
24
            { 'aTargets': [-1], 'bSortable': false }
24
            { 'aTargets': [-1], 'bSortable': false }
25
        ]
25
        ]
26
    }));
26
    }));
27
    $("#supplierlist").change(function() {
28
        var id = $(this).find("option:selected").val();
29
        window.location.href = "#" + id;
30
    });
27
});
31
});
28
//]]>
32
//]]>
29
</script>
33
</script>
Lines 49-59 $(document).ready(function() { Link Here
49
[% END %]
53
[% END %]
50
[% IF ( loop_suppliers.size ) %]
54
[% IF ( loop_suppliers.size ) %]
51
    [% UNLESS (count == 1) %]
55
    [% UNLESS (count == 1) %]
52
        <ul class="suppliers_anchors">
56
        <p>Choose a vendor in the list to jump directly to the right place.
57
        <select id="supplierlist">
53
            [% FOREACH supplier IN loop_suppliers %]
58
            [% FOREACH supplier IN loop_suppliers %]
54
                <li><a href="#[% supplier.booksellerid %]">[% supplier.name %]</a></li>
59
                <option value="[% supplier.booksellerid %]">[% supplier.name %]</option>
55
            [% END %]
60
            [% END %]
56
        </ul>
61
        </select>
62
        </p>
57
    [% END %]
63
    [% END %]
58
    <div id="acqui_order_supplierlist">
64
    <div id="acqui_order_supplierlist">
59
        [% FOREACH supplier IN loop_suppliers %]
65
        [% FOREACH supplier IN loop_suppliers %]
Lines 68-74 $(document).ready(function() { Link Here
68
                <span class="action">
74
                <span class="action">
69
                    [% IF ( CAN_user_acquisition_order_manage ) %]
75
                    [% IF ( CAN_user_acquisition_order_manage ) %]
70
                        [% IF ( supplier.active ) %]
76
                        [% IF ( supplier.active ) %]
71
                            <input type="button" value="New basket" onclick="window.location.href='/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form'" />
77
                            <input type="button" value="New basket" onclick="window.location.href='/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form'" />
72
                        [% ELSE %]
78
                        [% ELSE %]
73
                            (inactive)
79
                            (inactive)
74
                        [% END %]
80
                        [% END %]
Lines 81-89 $(document).ready(function() { Link Here
81
                            <thead>
87
                            <thead>
82
                                <tr>
88
                                <tr>
83
                                    <th>Basket (#)</th>
89
                                    <th>Basket (#)</th>
84
                                    <th>Biblios</th>
90
                                    <th>Item count</th>
85
                                    <th>Items</th>
91
                                    <th>Biblio count</th>
86
                                    <th>Expected items</th>
92
                                    <th>Items expected</th>
87
                                    <th>Created by</th>
93
                                    <th>Created by</th>
88
                                    <th>Date</th>
94
                                    <th>Date</th>
89
                                    <th>&nbsp;</th>
95
                                    <th>&nbsp;</th>
Lines 97-104 $(document).ready(function() { Link Here
97
                                        <tr>
103
                                        <tr>
98
                                    [% END %]
104
                                    [% END %]
99
                                        <td>[% basket.basketname %] (#[% basket.basketno %])</td>
105
                                        <td>[% basket.basketname %] (#[% basket.basketno %])</td>
100
                                        <td>[% basket.total_biblios %]</td>
101
                                        <td>[% basket.total_items %]</td>
106
                                        <td>[% basket.total_items %]</td>
107
                                        <td>[% basket.total_biblios %]</td>
102
                                        <td>[% basket.expected_items %]</td>
108
                                        <td>[% basket.expected_items %]</td>
103
                                        <td>
109
                                        <td>
104
                                            [% basket.authorisedby_firstname %]
110
                                            [% basket.authorisedby_firstname %]
105
- 

Return to bug 7169