From a1651a70a6a3a75cabb6955f931b34385b3e5a37 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 5 Feb 2021 19:38:03 +0000
Subject: [PATCH] Bug 27646: Allow export of Acquisition home and Funds tables

This patch swtiches these tables ot use KohaTables with exporting enabled

To test:
1 - Apply patch
2 - Confirm acquisitions home and funds tables display correctly
3 - Confirm you can export the tables

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 1acbe07f0b0b8b3fa8af604054027c7dfe7cf64a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit df66dc51eae3b799a8cd1378f5254c2cb93adf99)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 15a9daa089..1361b4a10a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -170,12 +170,13 @@
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
+    [% INCLUDE 'columns_settings.inc' %]
     <script>
         dt_overwrite_html_sorting_localeCompare();
 
         $(document).ready(function() {
 
-            var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
+            var oTable = KohaTable("accounts", {
                 "fnDrawCallback": function ( oSettings ) {
                     if ( oSettings.aiDisplay.length == 0 )
                     {
@@ -210,12 +211,11 @@
                     { "bVisible": false, "aTargets": [ 0, 1 ] },
                     { "bSortable": false, "aTargets": ["_all"] }
                 ],
-                'dom': '<"top pager"ilpf>tr<"bottom pager"ip>',
                 'bSort': true,
                 'aaSortingFixed': [[ 1, 'asc' ]],
                 'bPaginate': false,
                 "bAutoWidth": false
-            }));
+            });
 
             $(oTable).treetable({
                 expandable: true
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 9b7487a691..a52cda66f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -593,6 +593,7 @@
         </script>
     [% ELSIF op == 'list' %]
         [% INCLUDE 'datatables.inc' %]
+        [% INCLUDE 'columns_settings.inc' %]
         [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
 
         <script>
@@ -600,7 +601,7 @@
             //
             $(document).ready(function() {
                 [% IF budgets %]
-                    var oTable = $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
+                    var oTable = KohaTable("budgeth", {
                         "fnDrawCallback": function ( oSettings ) {
                             if ( oSettings.aiDisplay.length == 0 )
                             {
@@ -635,12 +636,11 @@
                             { "bVisible": false, "aTargets": [ 0, 1 ] },
                             { "bSortable": false, "aTargets": ["_all"] }
                         ],
-                        'dom': '<"top pager"ilpf>tr<"bottom pager"ip>',
                         'bSort': true,
                         'aaSortingFixed': [[ 1, 'asc' ]],
                         'bPaginate': false,
                         "bAutoWidth": false
-                    }));
+                    });
 
                     $(oTable).treetable({
                         expandable: true
-- 
2.39.5