@@ -, +, @@ another supplier --- C4/Serials.pm | 1 + .../intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) --- a/C4/Serials.pm +++ a/C4/Serials.pm @@ -2548,6 +2548,7 @@ sub subscriptionCurrentlyOnOrder { SELECT COUNT(*) FROM aqorders WHERE subscriptionid = ? AND datereceived IS NULL + AND datecancellationprinted IS NULL |; my $sth = $dbh->prepare( $query ); $sth->execute($subscriptionid); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -22,7 +22,6 @@ $(document).ready(function() { $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, [% IF (dateformat == 'metric') %] { "aTargets": [ -2 ], "sType": "uk_date" }, [% END %] @@ -95,10 +94,12 @@ [% IF (sub.alreadyOnOrder) %] Outstanding order (only one order per subscription is allowed) - [% ELSE %] + [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%] Order + [% ELSE %] + Not orderable [% END %] --