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

(-)a/admin/columns_settings.yml (+2 lines)
Lines 76-81 modules: Link Here
76
          columnname: ecost_tax_included
76
          columnname: ecost_tax_included
77
          is_hidden: 1
77
          is_hidden: 1
78
        -
78
        -
79
          columnname: replacement_price
80
        -
79
          columnname: quantity
81
          columnname: quantity
80
        -
82
        -
81
          columnname: total_tax_excluded
83
          columnname: total_tax_excluded
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-6 / +3 lines)
Lines 887-896 Link Here
887
        [% END %]
887
        [% END %]
888
    [% END %]
888
    [% END %]
889
    <script>
889
    <script>
890
<<<<<<< HEAD
890
        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
891
=======
892
        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) %];
893
>>>>>>> Bug 20966: Add column configuration to table of orders in a basket
894
        $(document).ready(function() {
891
        $(document).ready(function() {
895
            KohaTable("orders", {
892
            KohaTable("orders", {
896
                [% IF ( active ) %]
893
                [% IF ( active ) %]
Lines 900-906 Link Here
900
                    ],
897
                    ],
901
                [% END %]
898
                [% END %]
902
                "sPaginationType": "four_button",
899
                "sPaginationType": "four_button",
903
                "autoWidth": false
900
                "autoWidth": false,
901
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13]
904
            }, columns_settings);
902
            }, columns_settings);
905
903
906
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
904
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
907
- 

Return to bug 20966