From c45c935d2ca63c0995529099176bfa57df444e06 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Dec 2024 16:17:18 +0000 Subject: [PATCH] Bug 38701: Fix HTML validity errors in invoice template This patch makes some markup corrections to acqui/invoice.tt so that it passes an HTML validity check. - Moves incorrectly placed - Change to
and remove invalid
- Correct instances of "" (th cannot be self-closed) - Add id attribute to inputs to correspond to existing labels - Change "all_fund_dropdown" markup so that it validates but still works with the active/inactive fund display. To test, apply the patch and go to Acquisitions -> Invoices. Perform an invoice search which will return results. In the results click the invoice number to view the invoice. - Test the "show inactive" checkbox corresponding to the "Shipping fund" dropdown. Checking and unchecking it should work correctly to show and hide inactive funds. - Run the page source through https://validator.w3.org and confirm that there are no errors coming from this template. Sponsored-by: Athens County Public Libraries --- .../prog/en/modules/acqui/invoice.tt | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index baef5c261a..4bf835b4fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -353,14 +353,14 @@

[% order.branchcode | html %]

- [% IF has_invoice_unitprice %] - - [% IF order.invoice_unitprice %] - [% order.invoice_unitprice | $Price %] [% order.invoice_currency | html %] - [% END %] - - [% END %] + [% IF has_invoice_unitprice %] + + [% IF order.invoice_unitprice %] + [% order.invoice_unitprice | $Price %] [% order.invoice_currency | html %] + [% END %] + + [% END %] [% order.unitprice_tax_excluded | $Price %] @@ -389,7 +389,7 @@ [% order.tax_value | $Price %] - [% order.budget_name | html %]
+
[% order.budget_name | html %]
Modify fund @@ -404,7 +404,7 @@ [% END %] - + [% tf.quantity | html %] [% tf.total_tax_excluded | $Price %] [% tf.total_tax_included | $Price %] @@ -420,7 +420,7 @@ [% END %] - + [% total_quantity | html %] [% total_tax_excluded | $Price %] [% total_tax_included | $Price %] @@ -435,7 +435,7 @@ [% END %] - + [% total_quantity | html %] [% total_tax_excluded_shipment + total_adj | $Price %] [% total_tax_included_shipment + total_adj | $Price %] @@ -511,11 +511,11 @@
  • - +
  • - +
  • @@ -528,16 +528,18 @@
    - +
    + +
    [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] -- 2.39.5