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
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
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>
Thanks, Barbara!
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>
Pushed to master for 23.05. Nice work everyone, thanks!
Nice work everyone! Pushed to stable for 22.11.x
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;"> 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;"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt: <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt: <label for="showallbudgets" style="float:none;"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt: <label for="showallbudgets"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt: <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt: <label for="showallbudgets" style="float:none;"> Show inactive:</label> koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt: <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> It would be better to use a class and CSS rule in staff file. For another bug report of course ;)