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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-50 / +53 lines)
Lines 564-598 Link Here
564
                            <table id="orders">
564
                            <table id="orders">
565
                                <thead>
565
                                <thead>
566
                                    <tr>
566
                                    <tr>
567
                                        <th>No.</th>
567
                                        <th data-colname="order_line">No.</th>
568
                                        <th>[% tp('noun', 'Order') | html %]</th>
568
                                        <th data-colname="order_information">[% tp('noun', 'Order') | html %]</th>
569
                                        <th>RRP tax exc.</th>
569
                                        <th data-colname="recommended_retail_price_tax_excluded">RRP tax exc.</th>
570
                                        <th>Actual cost tax exc.</th>
570
                                        <th data-colname="actual_cost_tax_excluded">Actual cost tax exc.</th>
571
                                        <th>Budgeted cost tax exc.</th>
571
                                        <th data-colname="budgeted_cost_price_tax_included">Budgeted cost tax exc.</th>
572
                                        <th>RRP tax inc.</th>
572
                                        <th data-colname="recommended_retail_price_tax_included">RRP tax inc.</th>
573
                                        <th>Actual cost tax inc.</th>
573
                                        <th data-colname="actual_cost_tax_included">Actual cost tax inc.</th>
574
                                        <th>Budgeted cost tax inc.</th>
574
                                        <th data-colname="budgeted_cost_tax_included">Budgeted cost tax inc.</th>
575
                                        <th>Replacement price</th>
575
                                        <th data-colname="replacement_price">Replacement price</th>
576
                                        <th>Qty.</th>
576
                                        <th data-colname="quantity">Qty.</th>
577
                                        <th>Total tax exc. ([% currency | html %])</th>
577
                                        <th data-colname="total_tax_excluded">Total tax exc. ([% currency | html %])</th>
578
                                        <th>Total tax inc. ([% currency | html %])</th>
578
                                        <th data-colname="total_tax_included">Total tax inc. ([% currency | html %])</th>
579
                                        <th>GST %</th>
579
                                        <th data-colname="goods_and_services_tax_percentage">GST %</th>
580
                                        <th>GST</th>
580
                                        <th data-colname="goods_and_services_tax">GST</th>
581
                                        <th>Fund</th>
581
                                        <th data-colname="fund">Fund</th>
582
                                        <th>Estimated delivery date</th>
582
                                        <th data-colname="estimated_delivery_date">Estimated delivery date</th>
583
                                        <th>Statistic 1</th>
583
                                        <th data-colname="statistic1">Statistic 1</th>
584
                                        <th>Statistic 2</th>
584
                                        <th data-colname="statistic2">Statistic 2</th>
585
                                        <th>Invoice</th>
585
                                        <th data-colname="invoice">Invoice</th>
586
                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
586
                                        <th data-colname="supplier_report">Supplier report</th>
587
                                            <th>Supplier report</th>
587
                                        <th data-colname="place_hold" class="no-sort no-export">Place hold</th>
588
                                        [% END %]
588
                                        <th data-colname="modify" class="no-sort no-export">Modify</th>
589
                                        <th class="no-sort no-export">Place hold</th>
589
                                        <th data-colname="cancel" class="no-sort no-export">Cancel order</th>
590
                                        [% IF ( active && !closedate ) %]
591
                                            <th class="no-sort no-export">Modify</th>
592
                                        [% END %]
593
                                        [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
594
                                            <th class="no-sort no-export">Cancel order</th>
595
                                        [% END %]
596
                                    </tr>
590
                                    </tr>
597
                                </thead>
591
                                </thead>
598
                                <tfoot>
592
                                <tfoot>
Lines 617-632 Link Here
617
                                            <th>&nbsp;</th>
611
                                            <th>&nbsp;</th>
618
                                            <th>&nbsp;</th>
612
                                            <th>&nbsp;</th>
619
                                            <th>&nbsp;</th>
613
                                            <th>&nbsp;</th>
620
                                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
621
                                                <th>&nbsp;</th>
622
                                            [% END %]
623
                                            <th>&nbsp;</th>
614
                                            <th>&nbsp;</th>
624
                                            [% IF ( active && !closedate ) %]
615
                                            <th>&nbsp;</th>
625
                                                <th>&nbsp;</th>
616
                                            <th>&nbsp;</th>
626
                                            [% END %]
617
                                            <th>&nbsp;</th>
627
                                            [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
628
                                                <th>&nbsp;</th>
629
                                            [% END %]
630
                                        </tr>
618
                                        </tr>
631
                                    [% END %]
619
                                    [% END %]
632
                                    <tr>
620
                                    <tr>
Lines 649-664 Link Here
649
                                        <th>&nbsp;</th>
637
                                        <th>&nbsp;</th>
650
                                        <th>&nbsp;</th>
638
                                        <th>&nbsp;</th>
651
                                        <th>&nbsp;</th>
639
                                        <th>&nbsp;</th>
652
                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
653
                                            <th>&nbsp;</th>
654
                                        [% END %]
655
                                        <th>&nbsp;</th>
640
                                        <th>&nbsp;</th>
656
                                        [% IF ( active && !closedate ) %]
641
                                        <th>&nbsp;</th>
657
                                            <th>&nbsp;</th>
642
                                        <th>&nbsp;</th>
658
                                        [% END %]
643
                                        <th>&nbsp;</th>
659
                                        [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
660
                                            <th>&nbsp;</th>
661
                                        [% END %]
662
                                    </tr>
644
                                    </tr>
663
                                </tfoot>
645
                                </tfoot>
664
                                <tbody>
646
                                <tbody>
Lines 802-807 Link Here
802
784
803
                                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
785
                                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
804
                                                <td>[% books_loo.suppliers_report | html %]</td>
786
                                                <td>[% books_loo.suppliers_report | html %]</td>
787
                                            [% ELSE %]
788
                                                <td></td>
805
                                            [% END %]
789
                                            [% END %]
806
                                            <td>
790
                                            <td>
807
                                                [% IF ( books_loo.biblionumber && CAN_user_reserveforothers_place_holds ) %]
791
                                                [% IF ( books_loo.biblionumber && CAN_user_reserveforothers_place_holds ) %]
Lines 829-834 Link Here
829
                                                        >
813
                                                        >
830
                                                    [% END %]
814
                                                    [% END %]
831
                                                </td>
815
                                                </td>
816
                                            [% ELSE %]
817
                                                <td></td>
832
                                            [% END %]
818
                                            [% END %]
833
                                            [% IF ( !closedate || Koha.Preference('CancelOrdersInClosedBaskets') ) %]
819
                                            [% IF ( !closedate || Koha.Preference('CancelOrdersInClosedBaskets') ) %]
834
                                                <td>
820
                                                <td>
Lines 865-870 Link Here
865
                                                        [% END %]
851
                                                        [% END %]
866
                                                    [% END %]
852
                                                    [% END %]
867
                                                </td>
853
                                                </td>
854
                                            [% ELSE %]
855
                                                <td></td>
868
                                            [% END %]
856
                                            [% END %]
869
                                        </tr>
857
                                        </tr>
870
                                    [% END %]
858
                                    [% END %]
Lines 1255-1264 Link Here
1255
        $(document).ready(function() {
1243
        $(document).ready(function() {
1256
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1244
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1257
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1245
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1258
                // FIXME This cannot work correctly without bKohaColumnsUseNames
1246
                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 1;
1259
                table_settings['columns'].splice(18, 1);
1247
                table_settings.columns.find(c => c.columnname == 'supplier_report').cannot_be_toggled = 1;
1248
            [% ELSE %]
1249
                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 0;
1250
            [% END %]
1251
            [% IF ( active && !closedate ) %]
1252
                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 1;
1253
                table_settings.columns.find(c => c.columnname == 'modify').cannot_be_toggled = 1;
1254
            [% ELSE %]
1255
                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 0;
1256
            [% END %]
1257
            [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
1258
                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 1;
1259
                table_settings.columns.find(c => c.columnname == 'modify').cannot_be_toggled = 1;
1260
            [% ELSE %]
1261
                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 0;
1260
            [% END %]
1262
            [% END %]
1263
1261
            $("#orders").kohaTable({
1264
            $("#orders").kohaTable({
1265
                bKohaColumnsUseNames: true,
1262
                pagingType: "full",
1266
                pagingType: "full",
1263
                autoWidth: false,
1267
                autoWidth: false,
1264
            }, table_settings);
1268
            }, table_settings);
1265
- 

Return to bug 39930