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

(-)a/C4/Serials.pm (+1 lines)
Lines 2548-2553 sub subscriptionCurrentlyOnOrder { Link Here
2548
        SELECT COUNT(*) FROM aqorders
2548
        SELECT COUNT(*) FROM aqorders
2549
        WHERE subscriptionid = ?
2549
        WHERE subscriptionid = ?
2550
            AND datereceived IS NULL
2550
            AND datereceived IS NULL
2551
            AND datecancellationprinted IS NULL
2551
    |;
2552
    |;
2552
    my $sth = $dbh->prepare( $query );
2553
    my $sth = $dbh->prepare( $query );
2553
    $sth->execute($subscriptionid);
2554
    $sth->execute($subscriptionid);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-3 / +3 lines)
Lines 22-28 Link Here
22
    $(document).ready(function() {
22
    $(document).ready(function() {
23
        $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
23
        $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
24
            "aoColumnDefs": [
24
            "aoColumnDefs": [
25
                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
26
                [% IF (dateformat == 'metric') %]
25
                [% IF (dateformat == 'metric') %]
27
                    { "aTargets": [ -2 ], "sType": "uk_date" },
26
                    { "aTargets": [ -2 ], "sType": "uk_date" },
28
                [% END %]
27
                [% END %]
Lines 95-104 Link Here
95
                                <td>
94
                                <td>
96
                                    [% IF (sub.alreadyOnOrder) %]
95
                                    [% IF (sub.alreadyOnOrder) %]
97
                                        Outstanding order (only one order per subscription is allowed)
96
                                        Outstanding order (only one order per subscription is allowed)
98
                                    [% ELSE %]
97
                                    [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
99
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one">
98
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one">
100
                                            Order
99
                                            Order
101
                                        </a>
100
                                        </a>
101
                                    [% ELSE %]
102
                                        <a title="This subscription depends on another supplier" style="cursor:help">Not orderable</a>
102
                                    [% END %]
103
                                    [% END %]
103
                                </td>
104
                                </td>
104
                            </tr>
105
                            </tr>
105
- 

Return to bug 5343