From a79726e24fb0876c4beb09275cc9a515c7726316 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 3 Feb 2026 12:07:16 -0500 Subject: [PATCH] Bug 41760: Fix and in several templates This patch makes corrections to table markup in several templates, fixing these issues: - appearing before - appearing without a To test, apply the patch and view the following pages in the staff client. In each case the table should look correct, including the appearance of the table footer. - Acquisitions -> Vendor -> Basket. Add orders to a basket if necessary, in order for the "Orders" table to appear. - Acquisitions -> Vendor -> Basket -> Add to basket -> From existing orders (copy) -> Search for orders. You must have existing orders to populate the table of order search results. - Acquisitions -> Vendor -> Receive shipments -> Receive a new shipment. You must have pending orders to populate the table. Receive at least one order to ensure data for the next step. - Acquisitions home page -> "All available funds" table -> Click an amount linked in the "Spent" column. - Administration -> Funds. You must have at least one budget and at least one fund under that budget. - Administration -> Record overlay rules. - Patrons -> View a patron record -> Accounting -> Transactions. If necessary you can use "Create manual invoice" to add a charge to the account. - From the list of transactions, click the "Pay" button next to one of them. - Reports -> Cash register statistics wizard. - ?? - Reports -> Catalog by item type. Sponsored-by: Athens County Public Libraries --- .../prog/en/includes/patron-detail-tabs.inc | 22 +- .../prog/en/modules/acqui/basket.tt | 108 +++--- .../prog/en/modules/acqui/duplicate_orders.tt | 10 +- .../prog/en/modules/acqui/parcel.tt | 68 ++-- .../prog/en/modules/acqui/spent.tt | 66 ++-- .../prog/en/modules/admin/aqbudgets.tt | 30 +- .../en/modules/admin/marc-overlay-rules.tt | 112 +++---- .../prog/en/modules/members/boraccount.tt | 313 +++++++++--------- .../prog/en/modules/members/paycollect.tt | 22 +- .../en/modules/reports/cash_register_stats.tt | 34 +- .../prog/en/modules/reports/itemtypes.tt | 12 +- 11 files changed, 402 insertions(+), 395 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc index e60a5791322..7232495bf98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc @@ -134,16 +134,18 @@ Amount outstanding - [% FOREACH guarantee IN guarantees %] - - [% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %] - [% IF logged_in_user.can_see_patron_infos( guarantee ) %] - [% guarantee.account.balance | $Price %] - [% ELSE %] - - - [% END %] - - [% END %] + + [% FOREACH guarantee IN guarantees %] + + [% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %] + [% IF logged_in_user.can_see_patron_infos( guarantee ) %] + [% guarantee.account.balance | $Price %] + [% ELSE %] + - + [% END %] + + [% END %] + Total due [% guarantees_fines | $Price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index bae154948a0..da1f8aa71aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -751,60 +751,6 @@ Cancel order - - [% FOREACH foot_loo IN book_foot_loop %] - - - Total (GST [% foot_loo.tax_rate * 100 | html %]) -   -   -   -   -   -   -   - [% foot_loo.quantity | html %] - [% foot_loo.total_tax_excluded | $Price %] - [% foot_loo.total_tax_included | $Price %] -   - [% foot_loo.tax_value | $Price %] -   -   -   -   -   -   -   -   -   - - [% END %] - - - Total ([% currency | html %]) -   -   -   -   -   -   -   - [% total_quantity | html %] - [% total_tax_excluded | $Price %] - [% total_tax_included | $Price %] -   - [% total_tax_value | $Price %] -   -   -   -   -   -   -   -   -   - - [% FOREACH books_loo IN books_loop %] [% IF ( books_loo.order_received ) %] @@ -1019,6 +965,60 @@ [% END %] + + [% FOREACH foot_loo IN book_foot_loop %] + + + Total (GST [% foot_loo.tax_rate * 100 | html %]) +   +   +   +   +   +   +   + [% foot_loo.quantity | html %] + [% foot_loo.total_tax_excluded | $Price %] + [% foot_loo.total_tax_included | $Price %] +   + [% foot_loo.tax_value | $Price %] +   +   +   +   +   +   +   +   +   + + [% END %] + + + Total ([% currency | html %]) +   +   +   +   +   +   +   + [% total_quantity | html %] + [% total_tax_excluded | $Price %] + [% total_tax_included | $Price %] +   + [% total_tax_value | $Price %] +   +   +   +   +   +   +   +   +   + + [% IF ( listincgst ) %]** Vendor's listings already include tax.[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index c660a925bb2..85858d3a369 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -169,16 +169,16 @@ Fund - - [% FOREACH order IN selected_order_loop %] - [% INCLUDE display_order_line selected => 1 can_check => 1 %] - [% END %] - [% FOREACH order IN result_order_loop %] [% INCLUDE display_order_line can_check => 1 %] [% END %] + + [% FOREACH order IN selected_order_loop %] + [% INCLUDE display_order_line selected => 1 can_check => 1 %] + [% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 1970eebf1e4..2557eb0392b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -107,7 +107,7 @@ [% UNLESS (invoiceclosedate) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt index 75d1735db2e..955f6b1be3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt @@ -107,62 +107,6 @@   - [% UNLESS edit %] - - -   - - - - - - - - - - - - - - - - - - - - - - - - - [% END %] [% FOREACH rule IN rules %] @@ -309,6 +253,62 @@ [% END %] + [% UNLESS edit %] + + +   + + + + + + + + + + + + + + + + + + + + + + + + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 6db3bb56424..f4ff68e5ea1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -101,164 +101,167 @@ Actions - - - [% FOREACH account IN accounts %] - - [% account.date | $KohaDates %] - [% account.timestamp | $KohaDates with_hours = 1 %] - [% account.credit_number | html %] - [% PROCESS account_type_description account=account %] - - [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %] - [%- IF account.description %][% account.description | html %][% END %] -  [% IF ( account.itemnumber ) %] - [% account.item.biblio.title | html %] - [% END %] - [% IF ( account.itemnumber ) %] - [% account.item.barcode | html %] - [% END %] - [% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %] - [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] - [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] - [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %] - - [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %] - [% account.checkout.library.branchname | html %] - [% END %] - - [% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %] - - [% account.note | html_line_break %] - [% IF CAN_user_updatecharges_edit_accountline_notes %] - - [% END %] - - [% IF account.amount <= 0 %] - [% SET td_class="credit" %] - [% ELSE %] - [% SET td_class="debig" %] - [% END %] - [% account.amount | $Price %] - [% account.amountoutstanding | $Price %] - - [% IF ( account.is_credit ) %] - [% IF patron.notice_email_address %] -
- - -
- [% ELSE %] - Print + + + [% FOREACH account IN accounts %] + + [% account.date | $KohaDates %] + [% account.timestamp | $KohaDates with_hours = 1 %] + [% account.credit_number | html %] + [% PROCESS account_type_description account=account %] + + [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %] + [%- IF account.description %][% account.description | html %][% END %] +  [% IF ( account.itemnumber ) %] + [% account.item.biblio.title | html %] + [% END %] + [% IF ( account.itemnumber ) %] + [% account.item.barcode | html %] + [% END %] + [% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %] + + [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %] + [% account.checkout.library.branchname | html %] [% END %] + + [% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %] + + [% account.note | html_line_break %] + [% IF CAN_user_updatecharges_edit_accountline_notes %] + + [% END %] + + [% IF account.amount <= 0 %] + [% SET td_class="credit" %] [% ELSE %] - Print - [% END %] - Details - [% IF account.is_debit && account.amountoutstanding > 0 %] -
- - - - - - - - - -
- [% END %] - [% IF account.is_credit && account.status != 'VOID' %] - - [% END %] - [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %] - - [% END %] - [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %] - + [% SET td_class="debig" %] [% END %] - [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %] - - [% END %] - [% IF CAN_user_updatecharges_discount && account.is_debit && ( account.amountoutstanding == account.amount ) && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %] - - [% END %] - - - [% END %] + [% account.amount | $Price %] + [% account.amountoutstanding | $Price %] + + [% IF ( account.is_credit ) %] + [% IF patron.notice_email_address %] +
+ + +
+ [% ELSE %] + Print + [% END %] + [% ELSE %] + Print + [% END %] + Details + [% IF account.is_debit && account.amountoutstanding > 0 %] +
+ + + + + + + + + +
+ [% END %] + [% IF account.is_credit && account.status != 'VOID' %] + + [% END %] + [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %] + + [% END %] + [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %] + + [% END %] + [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %] + + [% END %] + [% IF CAN_user_updatecharges_discount && account.is_debit && ( account.amountoutstanding == account.amount ) && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %] + + [% END %] + + + [% END %] + Total due diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index ca44e9104dc..706a7cfdea0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -155,26 +155,26 @@
Pay an individual charge - + + - - - - - + + + + [% line.debit_type_code = debit_type_code %] - + + + + +
Description Account type Amount Amount outstanding
Total amount payable:[% amountoutstanding | $Price %]
[% individual_description | html %] [% PROCESS account_type_description account=line %] [% amount | $Price %] [% amountoutstanding | $Price %]
Total amount payable:[% amountoutstanding | $Price %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index dc10781e512..fcd76dea6c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -168,22 +168,24 @@ Item type - [% FOREACH loopresul IN loopresult %] - - [% loopresul.mfirstname | html %] [% loopresul.msurname | html %] - [% loopresul.cardnumber | html %] - [% loopresul.bfirstname | html %] [% loopresul.bsurname | html %] - [% loopresul.branchname | html %] - [% loopresul.date | $KohaDates %] - [% loopresul.timestamp | $KohaDates with_hours = 1 %] - [% loopresul.type_description | html %] - [% loopresul.note | html %] - [% loopresul.amount | $Price %] - [% loopresul.title | html %] - [% loopresul.barcode | html %] - [% ItemTypes.GetDescription(loopresul.itype) | html %] - - [% END %] + + [% FOREACH loopresul IN loopresult %] + + [% loopresul.mfirstname | html %] [% loopresul.msurname | html %] + [% loopresul.cardnumber | html %] + [% loopresul.bfirstname | html %] [% loopresul.bsurname | html %] + [% loopresul.branchname | html %] + [% loopresul.date | $KohaDates %] + [% loopresul.timestamp | $KohaDates with_hours = 1 %] + [% loopresul.type_description | html %] + [% loopresul.note | html %] + [% loopresul.amount | $Price %] + [% loopresul.title | html %] + [% loopresul.barcode | html %] + [% ItemTypes.GetDescription(loopresul.itype) | html %] + + [% END %] + [% IF transaction_type == "ACT" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index 05ef1a3ed1c..537cb4d5d3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -55,12 +55,6 @@ Count - - - TOTAL - [% mainloo.total | html %] - - [% FOREACH loopitemtyp IN mainloo.loopitemtype %] @@ -69,6 +63,12 @@ [% END %] + + + TOTAL + [% mainloo.total | html %] + + -- 2.39.5