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

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

Return to bug 40753