From 2786a5ce27dd3caa3b407ecbe40b8008fb32a9a3 Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Thu, 11 Jun 2020 14:54:17 +0200 Subject: [PATCH] Bug 25714: Basket columns configuration broken test plan: 1) try to change displayed column configuration for baskets 2) verify it doesn't work 3) apply patch 4) retry 1) and verify it works --- admin/columns_settings.yml | 4 ++ .../prog/en/modules/acqui/basket.tt | 37 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 7aca50b14e..ff66f350c4 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -67,11 +67,15 @@ modules: columnname: order_information - columnname: recommended_retail_price_tax_excluded + - + columnname: unitprice_tax_excluded - columnname: ecost_tax_excluded - columnname: recommended_retail_price_tax_included is_hidden: 1 + - + columnname: unitprice_tax_included - columnname: ecost_tax_included is_hidden: 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 8bbfe08ecc..0e22fd7170 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -395,26 +395,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + [% IF ( active ) %] [% UNLESS ( closedate ) %] - - + + [% END %] [% END %] @@ -927,6 +927,7 @@ ], [% END %] "sPaginationType": "full", + "bKohaColumnsUseNames": true, "autoWidth": false, "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13] }, columns_settings); -- 2.20.1
No.[% tp('noun', 'Order') | html %]RRP tax exc.Actual cost tax exc.Budgeted cost tax exc.RRP tax inc.Actual cost tax inc.Budgeted cost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFundSupplier reportNo.[% tp('noun', 'Order') | html %]RRP tax exc.Actual cost tax exc.Budgeted cost tax exc.RRP tax inc.Actual cost tax inc.Budgeted cost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFundSupplier reportModifyCancel orderModifyCancel order