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

(-)a/admin/columns_settings.yml (+6 lines)
Lines 152-157 modules: Link Here
152
              columnname: fund
152
              columnname: fund
153
            -
153
            -
154
              columnname: estimated_delivery_date
154
              columnname: estimated_delivery_date
155
            -
156
              columnname: statistic1
157
              is_hidden: 1
158
            -
159
              columnname: statistic2
160
              is_hidden: 1
155
            -
161
            -
156
              columnname: supplier_report
162
              columnname: supplier_report
157
            -
163
            -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +10 lines)
Lines 472-477 Link Here
472
                                                    <th>GST</th>
472
                                                    <th>GST</th>
473
                                                    <th>Fund</th>
473
                                                    <th>Fund</th>
474
                                                    <th>Estimated delivery date</th>
474
                                                    <th>Estimated delivery date</th>
475
                                                    <th>Statistic 1</th>
476
                                                    <th>Statistic 2</th>
475
                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
477
                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
476
                                                        <th>Supplier report</th>
478
                                                        <th>Supplier report</th>
477
                                                    [% END %]
479
                                                    [% END %]
Lines 502-507 Link Here
502
                                                        <th>[% foot_loo.tax_value | $Price %]</th>
504
                                                        <th>[% foot_loo.tax_value | $Price %]</th>
503
                                                        <th>&nbsp;</th>
505
                                                        <th>&nbsp;</th>
504
                                                        <th>&nbsp;</th>
506
                                                        <th>&nbsp;</th>
507
                                                        <th>&nbsp;</th>
508
                                                        <th>&nbsp;</th>
505
                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
509
                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
506
                                                            <th>&nbsp;</th>
510
                                                            <th>&nbsp;</th>
507
                                                        [% END %]
511
                                                        [% END %]
Lines 530-535 Link Here
530
                                                    <th>[% total_tax_value | $Price %]</th>
534
                                                    <th>[% total_tax_value | $Price %]</th>
531
                                                    <th>&nbsp;</th>
535
                                                    <th>&nbsp;</th>
532
                                                    <th>&nbsp;</th>
536
                                                    <th>&nbsp;</th>
537
                                                    <th>&nbsp;</th>
538
                                                    <th>&nbsp;</th>
533
                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
539
                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
534
                                                        <th>&nbsp;</th>
540
                                                        <th>&nbsp;</th>
535
                                                    [% END %]
541
                                                    [% END %]
Lines 650-655 Link Here
650
                                                                    <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
656
                                                                    <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
651
                                                            [% END %]
657
                                                            [% END %]
652
                                                        </td>
658
                                                        </td>
659
                                                        <td>[% books_loo.sort1 | html %]</td>
660
                                                        <td>[% books_loo.sort2 | html %]</td>
653
                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
661
                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
654
                                                            <td>[% books_loo.suppliers_report | html %]</td>
662
                                                            <td>[% books_loo.suppliers_report | html %]</td>
655
                                                        [% END %]
663
                                                        [% END %]
Lines 1075-1086 Link Here
1075
        $(document).ready(function() {
1083
        $(document).ready(function() {
1076
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1084
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1077
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1085
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1078
                table_settings['columns'].splice(16, 1);
1086
                table_settings['columns'].splice(18, 1);
1079
            [% END %]
1087
            [% END %]
1080
            KohaTable("orders", {
1088
            KohaTable("orders", {
1081
                "sPaginationType": "full",
1089
                "sPaginationType": "full",
1082
                "autoWidth": false,
1090
                "autoWidth": false,
1083
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15[% IF (Koha.Preference('EDIFACT') && ediaccount) %],16[% END %]],
1091
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17[% IF (Koha.Preference('EDIFACT') && ediaccount) %],18[% END %]],
1084
            }, table_settings);
1092
            }, table_settings);
1085
1093
1086
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
1094
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
1087
- 

Return to bug 34618