From 24eea5da791c6f300a0583c541944a3a2ab8292e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 17 Aug 2022 10:03:22 +0000 Subject: [PATCH] Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings On the basket summary page the estimated delivery date column was moved before the supplier report column, that is only visible when EDIFACT has been activated. It also adds the new column to the table configuration. --- admin/columns_settings.yml | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 18b2f239ff..08c2695497 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -150,6 +150,8 @@ modules: columnname: goods_and_services_tax - columnname: fund + - + columnmame: estimated_delivery_date - columnname: supplier_report - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 02c785c73a..aff9d364a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/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 ) %] -- 2.30.2