@@ -, +, @@
---
.../prog/en/modules/serials/subscription-detail.tt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -347,7 +347,7 @@
Order number |
Creation date |
Receive date |
- Status |
+ Status |
Fund |
Ordered |
Spent |
@@ -376,11 +376,11 @@
[% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] |
[% SWITCH order.orderstatus %]
- [% CASE 'new' %]New
- [% CASE 'ordered' %]Ordered
- [% CASE 'partial' %]Partial
- [% CASE 'complete' %]Complete
- [% CASE 'cancelled' %]Cancelled
+ [% CASE 'new' %]New
+ [% CASE 'ordered' %]Ordered
+ [% CASE 'partial' %]Partial
+ [% CASE 'complete' %]Complete
+ [% CASE 'cancelled' %]Cancelled
[% END %]
|
[% order.fund.budget_name %] |
@@ -433,7 +433,7 @@
var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
'bPaginate': false,
'bAutoWidth': false,
- "aaSorting": [[ 4, "desc" ]],
+ "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
"aoColumnDefs": [
{ "aTargets": "title-string", "sType": "title-string" }
]
@@ -441,7 +441,7 @@
$("#hide_received_orders").click(function(e){
e.preventDefault();
- table.fnFilter( '.', 4, true ); // Not empty "Receive date" columns
+ table.fnFilter( '^$', 4, true ); // Not empty "Receive date" columns
});
$("#show_all_orders").click(function(e){
e.preventDefault();
--