@@ -, +, @@
supplier report and fix column settings
---
admin/columns_settings.yml | 2 ++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
--- a/admin/columns_settings.yml
+++ a/admin/columns_settings.yml
@@ -150,6 +150,8 @@ modules:
columnname: goods_and_services_tax
-
columnname: fund
+ -
+ columnmame: estimated_delivery_date
-
columnname: supplier_report
-
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -448,10 +448,10 @@
GST % |
GST |
Fund |
+ Estimated delivery date |
[% IF Koha.Preference('EDIFACT') && ediaccount %]
Supplier report |
[% END %]
- Estimated delivery date |
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
Modify |
@@ -478,10 +478,10 @@
|
[% foot_loo.tax_value | $Price %] |
|
+ [% foot_loo.estimated_delivery_date | $KohaDates %] |
[% IF Koha.Preference('EDIFACT') && ediaccount %]
|
[% END %]
- [% foot_loo.estimated_delivery_date | $KohaDates %] |
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
|
@@ -506,10 +506,10 @@
|
[% total_tax_value | $Price %] |
|
+ [% estimated_delivery_date | $KohaDates %] |
[% IF Koha.Preference('EDIFACT') && ediaccount %]
|
[% END %]
- [% estimated_delivery_date | $KohaDates %] |
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
|
@@ -593,9 +593,6 @@
[% books_loo.tax_rate * 100 | html %] |
[% books_loo.tax_value | $Price %] |
[% books_loo.budget_name | html %] |
- [% IF Koha.Preference('EDIFACT') && ediaccount %]
- [% books_loo.suppliers_report | html %] |
- [% END %]
[% books_loo.estimated_delivery_date | $KohaDates %]
[% IF CAN_user_acquisition_order_manage %]
@@ -603,6 +600,9 @@
Edit
|
+ [% IF Koha.Preference('EDIFACT') && ediaccount %]
+ [% books_loo.suppliers_report | html %] |
+ [% END %]
[% END %]
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
--