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

(-)a/acqui/booksellers.pl (-1 / +2 lines)
Lines 93-99 if ( $supplier_count == 1 ) { Link Here
93
    $template->param(
93
    $template->param(
94
        supplier_name => $suppliers[0]->{'name'},
94
        supplier_name => $suppliers[0]->{'name'},
95
        booksellerid  => $suppliers[0]->{'id'},
95
        booksellerid  => $suppliers[0]->{'id'},
96
        basketcount   => $suppliers[0]->{'basketcount'}
96
        basketcount   => $suppliers[0]->{'basketcount'},
97
        active        => $suppliers[0]->{active},
97
    );
98
    );
98
}
99
}
99
100
(-)a/acqui/uncertainprice.pl (+1 lines)
Lines 129-134 $template->param( uncertainpriceorders => \@orders, Link Here
129
                                   booksellernotes => $bookseller->{'notes'},
129
                                   booksellernotes => $bookseller->{'notes'},
130
                                   basketcount   => $bookseller->{'basketcount'},
130
                                   basketcount   => $bookseller->{'basketcount'},
131
                                   subscriptioncount   => $bookseller->{'subscriptioncount'},
131
                                   subscriptioncount   => $bookseller->{'subscriptioncount'},
132
                                   active => $bookseller->{active},
132
                                   owner => $owner,
133
                                   owner => $owner,
133
                                   scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
134
                                   scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
134
$template->{'VARS'}->{'contacts'} = $bookseller->{'contacts'};
135
$template->{'VARS'}->{'contacts'} = $bookseller->{'contacts'};
(-)a/admin/aqcontract.pl (+1 lines)
Lines 53-58 $template->param( Link Here
53
    booksellerid   => $booksellerid,
53
    booksellerid   => $booksellerid,
54
    booksellername => $bookseller->{name},
54
    booksellername => $bookseller->{name},
55
    basketcount   => $bookseller->{'basketcount'},
55
    basketcount   => $bookseller->{'basketcount'},
56
    active         => $bookseller->{active},
56
    subscriptioncount   => $bookseller->{'subscriptioncount'},
57
    subscriptioncount   => $bookseller->{'subscriptioncount'},
57
);
58
);
58
59
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-3 / +3 lines)
Lines 14-23 function confirm_deletion() { Link Here
14
        <span class="caret"></span>
14
        <span class="caret"></span>
15
        </a>
15
        </a>
16
        <ul class="dropdown-menu">
16
        <ul class="dropdown-menu">
17
            [% IF ( CAN_user_acquisition_order_manage ) %]
17
            [% IF CAN_user_acquisition_order_manage && active %]
18
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">Basket</a></li>
18
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">Basket</a></li>
19
            [% END %]
19
            [% END %]
20
            [% IF ( CAN_user_acquisition_contracts_manage ) %]
20
            [% IF CAN_user_acquisition_contracts_manage && active %]
21
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Contract</a></li>
21
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Contract</a></li>
22
            [% END %]
22
            [% END %]
23
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
23
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
Lines 31-37 function confirm_deletion() { Link Here
31
                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
31
                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
32
                [% END %]
32
                [% END %]
33
            [% END %]
33
            [% END %]
34
            [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]
34
            [% IF CAN_user_acquisition_order_receive && basketcount && active %]
35
                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
35
                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
36
            [% END %]
36
            [% END %]
37
        [% ELSE %]
37
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-4 / +4 lines)
Lines 83-95 $(document).ready(function() { Link Here
83
                    [% IF ( CAN_user_acquisition_order_manage ) %]
83
                    [% IF ( CAN_user_acquisition_order_manage ) %]
84
                        [% IF ( supplier.active ) %]
84
                        [% IF ( supplier.active ) %]
85
                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
85
                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
86
                            [% IF ( supplier.loop_basket.size ) %]
87
                        <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
88
                            [% END %]
86
                        [% ELSE %]
89
                        [% ELSE %]
87
                            (inactive)
90
                            (inactive)
88
                        [% END %]
91
                        [% END %]
89
                    [% END %]
92
                    [% END %]
90
                        [% IF ( supplier.loop_basket.size ) %]
91
                    <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
92
                        [% END %]
93
                </span>
93
                </span>
94
                <div class="baskets">
94
                <div class="baskets">
95
                    [% IF ( supplier.loop_basket.size ) %]
95
                    [% IF ( supplier.loop_basket.size ) %]
Lines 157-163 $(document).ready(function() { Link Here
157
                                        <td>
157
                                        <td>
158
                                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
158
                                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
159
159
160
                                            [% UNLESS ( basket.closedate ) %]
160
                                            [% IF not basket.closedate and supplier.active %]
161
                                               | <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
161
                                               | <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
162
                                                <!-- Modal -->
162
                                                <!-- Modal -->
163
                                                <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
163
                                                <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-2 / +6 lines)
Lines 194-200 function Check(ff) { Link Here
194
                    [% END %]
194
                    [% END %]
195
                </table>
195
                </table>
196
                [% ELSE %]
196
                [% ELSE %]
197
                <div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Add a contract</a>.</div>
197
                    <div class="dialog message">
198
                        There are no contracts with this vendor.
199
                        [% IF active %]
200
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Add a contract</a>.
201
                        [% END %]
202
                    </div>
198
                [% END %]
203
                [% END %]
199
            [% END %]
204
            [% END %]
200
</div>
205
</div>
201
- 

Return to bug 12054