From 65bd8a0803f41c23f9b9962d45607c1624ab58bb Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer@bsz-bw.de>
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.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
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 @@
<th>GST %</th>
<th>GST</th>
<th>Fund</th>
+ <th>Estimated delivery date</th>
[% IF Koha.Preference('EDIFACT') && ediaccount %]
<th>Supplier report</th>
[% END %]
- <th>Estimated delivery date</th>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
<th class="NoSort">Modify</th>
@@ -478,10 +478,10 @@
<th> </th>
<th>[% foot_loo.tax_value | $Price %]</th>
<th> </th>
+ <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th>
[% IF Koha.Preference('EDIFACT') && ediaccount %]
<th> </th>
[% END %]
- <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
<th> </th>
@@ -506,10 +506,10 @@
<th> </th>
<th>[% total_tax_value | $Price %]</th>
<th> </th>
+ <th>[% estimated_delivery_date | $KohaDates %]</th>
[% IF Koha.Preference('EDIFACT') && ediaccount %]
<th> </th>
[% END %]
- <th>[% estimated_delivery_date | $KohaDates %]</th>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
<th> </th>
@@ -593,9 +593,6 @@
<td class="number">[% books_loo.tax_rate * 100 | html %]</td>
<td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
<td>[% books_loo.budget_name | html %]</td>
- [% IF Koha.Preference('EDIFACT') && ediaccount %]
- <td>[% books_loo.suppliers_report | html %]</td>
- [% END %]
<td class="actions">
[% books_loo.estimated_delivery_date | $KohaDates %]
[% IF CAN_user_acquisition_order_manage %]
@@ -603,6 +600,9 @@
<i class="fa fa-pencil"></i> Edit
</a>
</td>
+ [% IF Koha.Preference('EDIFACT') && ediaccount %]
+ <td>[% books_loo.suppliers_report | html %]</td>
+ [% END %]
[% END %]
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
--
2.30.2