From 0427aa71fa90a163589f4555e5665aca77c23543 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 24 Oct 2022 18:25:21 +0000
Subject: [PATCH] Bug 31929: Radio inputs need to be outside of respective
 labels

1. Apply patch
2. Go to Acquisitions and edit or create a vendor.
3. Look at the radio buttons in the Ordering information section.
4. They should be properly aligned.
5. Make sure the form still works and you can save changes.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/acqui/supplier.tt         | 80 ++++++++-----------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 934b18be67..dbd0ab6c50 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -201,19 +201,15 @@
             <legend>Ordering information</legend>
             <ol><li><label for="activestatus">Vendor is:</label>
                     [% IF ( active ) %]
-                        <label class="radio" for="activestatus">
-                            Active <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
-                        </label>
-                        <label class="radio" for="inactivestatus">
-                            Inactive <input type="radio" id="inactivestatus" name="status" value="0" />
-                        </label>
+                        <label class="radio" for="activestatus">Active</label>
+                        <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
+                        <label class="radio" for="inactivestatus">Inactive</label>
+                        <input type="radio" id="inactivestatus" name="status" value="0" />
                     [% ELSE %]
-                        <label class="radio" for="activestatus">
-                            Active <input type="radio" id="activestatus" name="status" value="1" />
-                        </label>
-                        <label class="radio" for="inactivestatus">
-                            Inactive <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
-                        </label>
+                        <label class="radio" for="activestatus">Active</label>
+                        <input type="radio" id="activestatus" name="status" value="1" />
+                        <label class="radio" for="inactivestatus">Inactive</label>
+                        <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
                     [% END %]</li>
             <li><label for="list_currency">List prices are: </label>
                 <select name="list_currency" id="list_currency">
@@ -239,53 +235,41 @@
             </li>
             <li><label for="gstyes">Tax number registered:</label>
                 [% IF ( gstreg ) %]
-                    <label class="radio" for="gstyes">
-                        Yes <input type="radio" name="gst" id="gstyes" value="1" checked="checked" />
-                    </label>
-                    <label class="radio" for="gstno">
-                        No <input type="radio" name="gst" id="gstno" value="0" />
-                    </label>
+                    <label class="radio" for="gstyes">Yes</label>
+                    <input type="radio" name="gst" id="gstyes" value="1" checked="checked" />
+                    <label class="radio" for="gstno">No</label>
+                    <input type="radio" name="gst" id="gstno" value="0" />
                 [% ELSE %]
-                    <label class="radio" for="gstyes">
-                        Yes <input type="radio" name="gst" id="gstyes" value="1" />
-                    </label>
-                    <label class="radio" for="gstno">
-                        No <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
-                    </label>
+                    <label class="radio" for="gstyes">Yes</label>
+                    <input type="radio" name="gst" id="gstyes" value="1" />
+                    <label class="radio" for="gstno">No</label>
+                    <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
                 [% END %]</li>
 
             <li><label for="list_gstyes">List prices:</label>
                 [% IF ( listincgst ) %]
-                    <label class="radio" for="list_gstyes">
-                        Include tax <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
-                    </label>
-                    <label class="radio" for="list_gstno">
-                        Don't include tax <input type="radio" id="list_gstno" name="list_gst" value="0" />
-                    </label>
+                    <label class="radio" for="list_gstyes">Include tax</label>
+                    <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
+                    <label class="radio" for="list_gstno">Don't include tax</label>
+                    <input type="radio" id="list_gstno" name="list_gst" value="0" />
                 [% ELSE %]
-                    <label class="radio" for="list_gstyes">
-                        Include tax <input type="radio" id="list_gstyes" name="list_gst" value="1" />
-                    </label>
-                    <label class="radio" for="list_gstno">
-                        Don't include tax <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" />
-                    </label>
+                    <label class="radio" for="list_gstyes">Include tax</label>
+                    <input type="radio" id="list_gstyes" name="list_gst" value="1" />
+                    <label class="radio" for="list_gstno">Don't include tax</label>
+                    <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" />
                 [% END %]</li>
 
             <li><label for="invoice_gstyes">Invoice prices:</label>
                 [% IF ( invoiceincgst ) %]
-                    <label class="radio" for="invoice_gstyes">
-                        Include tax <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
-                    </label>
-                    <label class="radio" for="invoice_gstno">
-                        Don't include tax <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
-                    </label>
+                    <label class="radio" for="invoice_gstyes">Include tax</label>
+                    <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
+                    <label class="radio" for="invoice_gstno">Don't include tax</label>
+                    <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
                     [% ELSE %]
-                    <label class="radio" for="invoice_gstyes">
-                        Include tax <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
-                    </label>
-                    <label class="radio" for="invoice_gstno">
-                        Don't include tax <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
-                    </label>
+                    <label class="radio" for="invoice_gstyes">Include tax</label>
+                    <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
+                    <label class="radio" for="invoice_gstno">Don't include tax</label>
+                    <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
                 [% END %]</li>
 
             [% IF gst_values %]
-- 
2.39.5