View | Details | Raw Unified | Return to bug 25714
Collapse All | Expand All

(-)a/admin/columns_settings.yml (+4 lines)
Lines 67-77 modules: Link Here
67
          columnname: order_information
67
          columnname: order_information
68
        -
68
        -
69
          columnname: recommended_retail_price_tax_excluded
69
          columnname: recommended_retail_price_tax_excluded
70
        -
71
          columnname: unitprice_tax_excluded
70
        -
72
        -
71
          columnname: ecost_tax_excluded
73
          columnname: ecost_tax_excluded
72
        -
74
        -
73
          columnname: recommended_retail_price_tax_included
75
          columnname: recommended_retail_price_tax_included
74
          is_hidden: 1
76
          is_hidden: 1
77
        -
78
          columnname: unitprice_tax_included
75
        -
79
        -
76
          columnname: ecost_tax_included
80
          columnname: ecost_tax_included
77
          is_hidden: 1
81
          is_hidden: 1
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-19 / +19 lines)
Lines 395-420 Link Here
395
            <table id="orders">
395
            <table id="orders">
396
                <thead>
396
                <thead>
397
                    <tr>
397
                    <tr>
398
                        <th>No.</th>
398
                        <th data-colname="basket_number">No.</th>
399
                        <th>[% tp('noun', 'Order') | html %]</th>
399
                        <th data-colname="order_information">[% tp('noun', 'Order') | html %]</th>
400
                        <th>RRP tax exc.</th>
400
                        <th data-colname="recommended_retail_price_tax_excluded">RRP tax exc.</th>
401
                        <th>Actual cost tax exc.</th>
401
                        <th data-colname="unitprice_tax_excluded">Actual cost tax exc.</th>
402
                        <th>Budgeted cost tax exc.</th>
402
                        <th data-colname="ecost_tax_excluded">Budgeted cost tax exc.</th>
403
                        <th>RRP tax inc.</th>
403
                        <th data-colname="recommended_retail_price_tax_included">RRP tax inc.</th>
404
                        <th>Actual cost tax inc.</th>
404
                        <th data-colname="unitprice_tax_included">Actual cost tax inc.</th>
405
                        <th>Budgeted cost tax inc.</th>
405
                        <th data-colname="ecost_tax_included">Budgeted cost tax inc.</th>
406
                        <th>Replacement price</th>
406
                        <th data-colname="replacement_price">Replacement price</th>
407
                        <th>Qty.</th>
407
                        <th data-colname="quantity">Qty.</th>
408
                        <th>Total tax exc. ([% currency | html %])</th>
408
                        <th data-colname="total_tax_excluded">Total tax exc. ([% currency | html %])</th>
409
                        <th>Total tax inc. ([% currency | html %])</th>
409
                        <th data-colname="total_tax_included">Total tax inc. ([% currency | html %])</th>
410
                        <th>GST %</th>
410
                        <th data-colname="goods_and_services_tax_percentage">GST %</th>
411
                        <th>GST</th>
411
                        <th data-colname="goods_and_services_tax">GST</th>
412
                        <th>Fund</th>
412
                        <th data-colname="fund">Fund</th>
413
                        <th>Supplier report</th>
413
                        <th data-colname="supplier_report">Supplier report</th>
414
                        [% IF ( active ) %]
414
                        [% IF ( active ) %]
415
                            [% UNLESS ( closedate ) %]
415
                            [% UNLESS ( closedate ) %]
416
                                <th class="NoSort">Modify</th>
416
                                <th class="NoSort" data-colname="modify">Modify</th>
417
                                <th class="NoSort">Cancel order</th>
417
                                <th class="NoSort" data-colname="cancel">Cancel order</th>
418
                            [% END %]
418
                            [% END %]
419
                        [% END %]
419
                        [% END %]
420
                    </tr>
420
                    </tr>
Lines 927-932 Link Here
927
                    ],
927
                    ],
928
                [% END %]
928
                [% END %]
929
                "sPaginationType": "full",
929
                "sPaginationType": "full",
930
                "bKohaColumnsUseNames": true,
930
                "autoWidth": false,
931
                "autoWidth": false,
931
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13]
932
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13]
932
            }, columns_settings);
933
            }, columns_settings);
933
- 

Return to bug 25714