Bug 33721 - Show inactive funds in invoice.tt out of order
Summary: Show inactive funds in invoice.tt out of order
Status: RESOLVED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: Main
Hardware: All All
: P5 - low minor (vote)
Assignee: Katrin Fischer
QA Contact: Marcel de Rooy
URL:
Keywords:
Depends on:
Blocks: 34452 34492
  Show dependency treegraph
 
Reported: 2023-05-11 20:50 UTC by Caroline Cyr La Rose
Modified: 2023-12-28 20:47 UTC (History)
3 users (show)

See Also:
Change sponsored?: ---
Patch complexity: Trivial patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
23.05.00,22.11.07


Attachments
Screenshot of the invoice section with the fund line (24.13 KB, image/png)
2023-05-11 20:50 UTC, Caroline Cyr La Rose
Details
Bug 33721: Fix display of shipping cost/fund on invoice summary page (1.87 KB, patch)
2023-05-14 11:22 UTC, Katrin Fischer
Details | Diff | Splinter Review
Bug 33721: Fix display of shipping cost/fund on invoice summary page (1.93 KB, patch)
2023-05-14 16:44 UTC, ByWater Sandboxes
Details | Diff | Splinter Review
Bug 33721: Fix display of shipping cost/fund on invoice summary page (2.03 KB, patch)
2023-05-17 14:20 UTC, Marcel de Rooy
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Caroline Cyr La Rose 2023-05-11 20:50:29 UTC
Created attachment 151100 [details]
Screenshot of the invoice section with the fund line

When viewing an invoice, the elements in the 'Fund' line are out of order.

The is the '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.


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
Comment 1 Katrin Fischer 2023-05-14 11:22:33 UTC
Created attachment 151171 [details] [review]
Bug 33721: Fix display of shipping cost/fund on invoice summary page

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
Comment 2 ByWater Sandboxes 2023-05-14 16:44:46 UTC
Created attachment 151177 [details] [review]
Bug 33721: Fix display of shipping cost/fund on invoice summary page

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>
Comment 3 Katrin Fischer 2023-05-14 16:51:07 UTC
Thanks, Barbara!
Comment 4 Marcel de Rooy 2023-05-17 14:20:54 UTC
Created attachment 151342 [details] [review]
Bug 33721: Fix display of shipping cost/fund on invoice summary page

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>
Comment 5 Tomás Cohen Arazi 2023-05-18 14:04:50 UTC
Pushed to master for 23.05.

Nice work everyone, thanks!
Comment 6 Matt Blenkinsop 2023-06-08 16:43:20 UTC
Nice work everyone!

Pushed to stable for 22.11.x
Comment 7 Fridolin Somers 2023-08-04 18:39:27 UTC
Ah OK all places use style in label tag :

 > git grep 'Show inactive:</label>'
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt:                                                    <label for="all_showallbudgets" style="float:none;width:auto;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt:                  <label for="all_showallbudgets" style="float:none;width:auto;margin-right:0;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt:    <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt:                <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt:                                            <label for="showallbudgets">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt:            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt:        <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt:                            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>

It would be better to use a class and CSS rule in staff file.

For another bug report of course ;)