From 1e7e457f75b3b467dc2a3f80e183308cbc037327 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 9 Nov 2022 16:24:06 +0000
Subject: [PATCH] Bug 31828: Add page-section to list of open invoices on
 receive shipment page (acq)

This patch adds a "page-section" class to the div wrapping the table
of shipments on the "Receive shipment" page in Acquisitions.

This patch also modifies the markup around additional fields so that an
empty fieldset is not displayed when there are no additional fields to
display.

To test, apply the patch and go to Acquisitions.

- Locate a vendor and view its details.
- In the toolbar, click "Receive shipments."
- On the receive page, there should be a section listing shipments and a
  section headed "Receive a new shipment."
- If you have additional fields defined (in Administration -> Additional
  fields -> Invoices) there should be a third section showing those
  fields.
- With no additional fields defined you should not see an empty
  fieldset.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 1e890ac1a7..06271286d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -79,7 +79,7 @@
 
 [% IF ( count ) %]
 <p> [% count | html %] shipments</p>
-<div id="resultlist">
+<div id="resultlist" class="page-section">
 <!-- Search Results Table -->
 
 <table class="small" id="parcelst">
@@ -191,11 +191,9 @@
         </li>
 		</ol>
     </fieldset>
-            <fieldset class="rows">
-                [% IF available_additional_fields %]
-                    [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
-                [% END %]
-            </fieldset>
+            [% IF available_additional_fields %]
+                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
+            [% END %]
             <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
         </form>
     </div>
-- 
2.39.5