Bugzilla – Attachment 105754 Details for
Bug 25714
Columns configuration for order table doesn't apply
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25714: Basket columns configuration broken
Bug-25714-Basket-columns-configuration-broken.patch (text/plain), 4.54 KB, created by
Arthur Suzuki
on 2020-06-11 13:15:46 UTC
(
hide
)
Description:
Bug 25714: Basket columns configuration broken
Filename:
MIME Type:
Creator:
Arthur Suzuki
Created:
2020-06-11 13:15:46 UTC
Size:
4.54 KB
patch
obsolete
>From 2786a5ce27dd3caa3b407ecbe40b8008fb32a9a3 Mon Sep 17 00:00:00 2001 >From: Arthur Suzuki <arthur.suzuki@biblibre.com> >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 @@ > <table id="orders"> > <thead> > <tr> >- <th>No.</th> >- <th>[% tp('noun', 'Order') | html %]</th> >- <th>RRP tax exc.</th> >- <th>Actual cost tax exc.</th> >- <th>Budgeted cost tax exc.</th> >- <th>RRP tax inc.</th> >- <th>Actual cost tax inc.</th> >- <th>Budgeted cost tax inc.</th> >- <th>Replacement price</th> >- <th>Qty.</th> >- <th>Total tax exc. ([% currency | html %])</th> >- <th>Total tax inc. ([% currency | html %])</th> >- <th>GST %</th> >- <th>GST</th> >- <th>Fund</th> >- <th>Supplier report</th> >+ <th data-colname="basket_number">No.</th> >+ <th data-colname="order_information">[% tp('noun', 'Order') | html %]</th> >+ <th data-colname="recommended_retail_price_tax_excluded">RRP tax exc.</th> >+ <th data-colname="unitprice_tax_excluded">Actual cost tax exc.</th> >+ <th data-colname="ecost_tax_excluded">Budgeted cost tax exc.</th> >+ <th data-colname="recommended_retail_price_tax_included">RRP tax inc.</th> >+ <th data-colname="unitprice_tax_included">Actual cost tax inc.</th> >+ <th data-colname="ecost_tax_included">Budgeted cost tax inc.</th> >+ <th data-colname="replacement_price">Replacement price</th> >+ <th data-colname="quantity">Qty.</th> >+ <th data-colname="total_tax_excluded">Total tax exc. ([% currency | html %])</th> >+ <th data-colname="total_tax_included">Total tax inc. ([% currency | html %])</th> >+ <th data-colname="goods_and_services_tax_percentage">GST %</th> >+ <th data-colname="goods_and_services_tax">GST</th> >+ <th data-colname="fund">Fund</th> >+ <th data-colname="supplier_report">Supplier report</th> > [% IF ( active ) %] > [% UNLESS ( closedate ) %] >- <th class="NoSort">Modify</th> >- <th class="NoSort">Cancel order</th> >+ <th class="NoSort" data-colname="modify">Modify</th> >+ <th class="NoSort" data-colname="cancel">Cancel order</th> > [% END %] > [% END %] > </tr> >@@ -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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25714
: 105754