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

(-)a/admin/columns_settings.yml (+2 lines)
Lines 150-155 modules: Link Here
150
              columnname: goods_and_services_tax
150
              columnname: goods_and_services_tax
151
            -
151
            -
152
              columnname: fund
152
              columnname: fund
153
            -
154
              columnmame: estimated_delivery_date
153
            -
155
            -
154
              columnname: supplier_report
156
              columnname: supplier_report
155
            -
157
            -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-7 / +6 lines)
Lines 448-457 Link Here
448
                        <th>GST %</th>
448
                        <th>GST %</th>
449
                        <th>GST</th>
449
                        <th>GST</th>
450
                        <th>Fund</th>
450
                        <th>Fund</th>
451
                        <th>Estimated delivery date</th>
451
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
452
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
452
                        <th>Supplier report</th>
453
                        <th>Supplier report</th>
453
                        [% END %]
454
                        [% END %]
454
                        <th>Estimated delivery date</th>
455
                        [% IF ( active ) %]
455
                        [% IF ( active ) %]
456
                            [% UNLESS ( closedate ) %]
456
                            [% UNLESS ( closedate ) %]
457
                                <th class="NoSort">Modify</th>
457
                                <th class="NoSort">Modify</th>
Lines 478-487 Link Here
478
                        <th>&nbsp;</th>
478
                        <th>&nbsp;</th>
479
                        <th>[% foot_loo.tax_value | $Price %]</th>
479
                        <th>[% foot_loo.tax_value | $Price %]</th>
480
                        <th>&nbsp;</th>
480
                        <th>&nbsp;</th>
481
                        <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th>
481
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
482
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
482
                        <th>&nbsp;</th>
483
                        <th>&nbsp;</th>
483
                        [% END %]
484
                        [% END %]
484
                        <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th>
485
                        [% IF ( active ) %]
485
                        [% IF ( active ) %]
486
                            [% UNLESS ( closedate ) %]
486
                            [% UNLESS ( closedate ) %]
487
                                <th>&nbsp;</th>
487
                                <th>&nbsp;</th>
Lines 506-515 Link Here
506
                    <th>&nbsp;</th>
506
                    <th>&nbsp;</th>
507
                    <th>[% total_tax_value | $Price %]</th>
507
                    <th>[% total_tax_value | $Price %]</th>
508
                    <th>&nbsp;</th>
508
                    <th>&nbsp;</th>
509
                    <th>[% estimated_delivery_date | $KohaDates %]</th>
509
                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
510
                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
510
                    <th>&nbsp;</th>
511
                    <th>&nbsp;</th>
511
                    [% END %]
512
                    [% END %]
512
                    <th>[% estimated_delivery_date | $KohaDates %]</th>
513
                    [% IF ( active ) %]
513
                    [% IF ( active ) %]
514
                        [% UNLESS ( closedate ) %]
514
                        [% UNLESS ( closedate ) %]
515
                            <th>&nbsp;</th>
515
                            <th>&nbsp;</th>
Lines 593-601 Link Here
593
                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
593
                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
594
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
594
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
595
                        <td>[% books_loo.budget_name | html %]</td>
595
                        <td>[% books_loo.budget_name | html %]</td>
596
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
597
                        <td>[% books_loo.suppliers_report | html %]</td>
598
                        [% END %]
599
                        <td class="actions">
596
                        <td class="actions">
600
                            [% books_loo.estimated_delivery_date | $KohaDates %]
597
                            [% books_loo.estimated_delivery_date | $KohaDates %]
601
                            [% IF CAN_user_acquisition_order_manage %]
598
                            [% IF CAN_user_acquisition_order_manage %]
Lines 603-608 Link Here
603
                                <i class="fa fa-pencil"></i> Edit
600
                                <i class="fa fa-pencil"></i> Edit
604
                            </a>
601
                            </a>
605
                        </td>
602
                        </td>
603
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
604
                        <td>[% books_loo.suppliers_report | html %]</td>
605
                        [% END %]
606
                    [% END %]
606
                    [% END %]
607
                        [% IF ( active ) %]
607
                        [% IF ( active ) %]
608
                            [% UNLESS ( closedate ) %]
608
                            [% UNLESS ( closedate ) %]
609
- 

Return to bug 15348