Attachment 151342 Details for Bug 33721 – Bug 33721: Fix display of shipping cost/fund on invoice summary page

[patch] Bug 33721: Fix display of shipping cost/fund on invoice summary page

Bug-33721-Fix-display-of-shipping-costfund-on-invo.patch (text/plain), 2.03 KB, created by Marcel de Rooy on 2023-05-17 14:20:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2023-05-17 14:20:54 UTC

Size: 2.03 KB

patch

obsolete

>From 95b0e0941a6258d72bafd789f2a416ff6cba306d Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 14 May 2023 11:19:07 +0000
>Subject: [PATCH] Bug 33721: Fix display of shipping cost/fund on invoice
> summary page
>Content-Type: text/plain; charset=utf-8
>
>When viewing an invoice, the elements in the 'Fund' line were out of order:
>'Fund:' label, followed by 'Show inactive:' label, then the fund drop-down and then the show inactive checkbox.
>
>The order should be:
>'Fund:' label, fund drop-down, 'Show inactive:' label, show inactive checkbox.
>
>This copies the markup that is used when you click on "Receive shipment".
>It also changes 'Fund' to 'Shipping fund' to bring the forms even more in line.
>
>To recreate:
>1. In acquisitions, create an order and close the basket
>2. Click 'Receive shipment' and receive the order
>3. Click 'Finish receiving'
>   --> The Fund line in invoice.tt is out of order
>4. Apply patch
>5. Verify the order is now fixed
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 ++--
> 1 file changed, 2 insertions(+), 2 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 3edab4d332..4b7632ab82 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>@@ -7,10 +7,10 @@
> [% USE AuthorisedValues %]
> 
> [% BLOCK fund_dropdown %]
>-    <label for="[% form_name | html %]">Fund: </label>
>+    <label for="[% form_name | html %]">Shipping fund: </label>
>     <select id="[% form_id | html %]" name="[% form_name | html %]" class="fund_dropdown" data-selected="[% selected | html %]">
>     </select>
>-    <label for="showallfunds">&nbsp;Show inactive:</label>
>+    <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
>     <input type="checkbox" class="showallfunds" />
> [% END %]
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33721: 151100 | 151171 | 151177 | 151342