From ef2c52b4a06172ed168bbee0ae98009a643435e2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 12 Oct 2018 14:26:44 -0300
Subject: [PATCH] Bug 21467: Fix default sort
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Sponsored-by: BULAC - http://www.bulac.fr/

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/serials/subscription-detail.tt          | 6 +-----
 serials/subscription-detail.pl                              | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 6296236505..58f79164a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -358,7 +358,6 @@
 
                 <thead>
                     <tr>
-                        <th class="NoVisible">Timestamp</th>
                         <th>Invoice</th>
                         <th>Basket</th>
                         <th>Order number</th>
@@ -380,7 +379,6 @@
                     [% ELSE %]
                         <tr data-tt-id="[% order.parent_ordernumber | html %]">
                     [% END %]
-                        <td>[% order.timestamp | html %]</td>
                         <td>
                         [% IF order.invoice %]
                             [% IF CAN_user_acquisition %]
@@ -472,9 +470,7 @@
 
                 'bPaginate': false,
                 'bAutoWidth': false,
-                'bSort': true,
-                'aaSortingFixed': [[ 0, 'desc' ]],
-                "bSortCellsTop": true
+                'bSort': false,
             }, columns_settings);
 
             $(table).treetable({
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 1d109eb22d..9ea681b23a 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -129,7 +129,7 @@ for my $field ( @$additional_fields ) {
 $template->param( additional_fields_for_subscription => $additional_fields );
 
 # FIXME Do we want to hide canceled orders?
-my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid } );
+my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => { -desc => 'parent_ordernumber' } } );
 
 $template->param(
     subscriptionid => $subscriptionid,
-- 
2.20.1