From 08a4e352af2b5a0bd53c8cebe8a77bcc99f72b20 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 18 Sep 2026 15:31:22 +0200 Subject: [PATCH] Bug 42330: (follow-up) Tidy Something very messy happened during the last rebase before push. Sorry! I've restored the original version: git rebase -i HEAD~258 Edit commit b02ca1270d6eeb3 and remove the next one (Tidy) perl misc/devel/tidy.pl $(git diff --name-only HEAD~1) git commit -a git rebase --continue Luckily there was no conflict! I then picked the version of those files and here is the commit. Use this to confirm: `git show -w ad694a3411e677fcea96f315758793fd1fe0f203` You should see changes that are not related to tidiness Signed-off-by: Owen Leonard Signed-off-by: Pedro Amorim --- .../prog/en/modules/acqui/invoices.tt | 9 + .../prog/en/modules/acqui/parcels.tt | 3 + .../prog/en/modules/admin/aqbudgets.tt | 244 +----------------- .../prog/en/modules/members/memberentrygen.tt | 41 ++- 4 files changed, 56 insertions(+), 241 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 989407ac12..c0cde0c5ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -4,6 +4,7 @@ [% USE AuthorisedValues %] [% USE KohaDates %] [% USE Branches %] +[% USE Price %] [% SET footerjs = 1 %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] @@ -171,6 +172,7 @@ Billing date Received bibliographic records Received items + Total Status   @@ -196,6 +198,13 @@ [% invoice.billingdate | $KohaDates %] [% invoice.receivedbiblios | html %] [% invoice.receiveditems | html %] + + [% IF invoice.invoiceincgst %] + [% invoice.total_tax_included + invoice.total_adj + invoice.shipmentcost | $Price %] + [% ELSE %] + [% invoice.total_tax_excluded + invoice.total_adj + invoice.shipmentcost | $Price %] + [% END %] + [% IF invoice.closedate %] Closed on [% invoice.closedate | $KohaDates %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index cbd6ef6610..ccd3fa0cc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -2,6 +2,7 @@ [% USE Koha %] [% USE Asset %] [% USE KohaDates %] +[% USE Price %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -142,6 +143,7 @@ Item count [% tp("Bibliographic record", "Record count") | html %] Items expected + Total @@ -160,6 +162,7 @@ [% searchresult.reccount | html %] [% searchresult.bibcount | html %] [% searchresult.itemcount | html %] + [% searchresult.totalamount | $Price %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index be557e66ed..8cfea53f1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -345,237 +345,21 @@ [% END %]
- Fund details + - - - [% IF op == 'add_form' && !error_not_authorised_to_modify %] -
- [% INCLUDE 'csrf-token.inc' %] -

- [% IF ( budget_id ) %] - [% IF ( budget_period_description ) %] - [% tx("Modify fund '{fund_name}' for budget '{budget}'", { fund_name = budget_name, budget = budget_period_description }) | html %] - [% ELSE %] - [% tx("Modify fund '{fund_name}'", { fund_name = budget_name }) | html %] - [% END %] - [% ELSE %] - [% IF ( budget_parent_name ) %] - [% tx("Add fund to '{fund_parent}'", {fund_parent = budget_parent_name}) %] - [% ELSE %] - [% t("New fund") | html %] - [% END %] - [% END %] -

-
- - - - - [% IF ( budget_parent_id ) %] -
-
- Fund parent: -
-
- [% budget_parent_name | html %] - [% budget_parent_id | html %] - - [% budget_parent_name | html %] - -
-
- [% END %] -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
0 to disable
-
- -
-
- -
-
- -
-
0 to disable
-
- -
-
- Owner: -
-
- [% IF budget_owner %] - - [% budget_owner.firstname | html %] [% budget_owner.surname | html %] | - - [% ELSE %] - - [% END %] - Select owner - Remove owner - -
-
- - [% IF budget_has_children %] -
-
- -
-
- -
-
Selecting this option will overwrite existing fund owners, if any
-
- [% END %] - -
-
- Users: -
-
- - -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - [% IF ( budget_id ) %] - - [% END %] -
- -
- Cancel - -
-
- [% END %] - - - [% IF op == 'delete_confirm' %] -
-

[% tx("Confirm deletion of fund '{fund}'?", {fund = budget_name}) %]

-

If you delete this fund, all orders linked to this fund will be deleted!

- - - - - -
Fund amount:[% budget_amount | $Price %]
- -
- [% INCLUDE 'csrf-token.inc' %] - - - - -
-
- -
+ + + [% IF ( budget_parent_id ) %] +
+
+ Fund parent: +
+
+ [% budget_parent_name | html %] + [% budget_parent_id | html %] + - [% budget_parent_name | html %] + +
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 33924ce3bc..f280db39ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -3,6 +3,7 @@ [% USE To %] [% USE Koha %] [% USE KohaDates %] +[% USE HtmlScrubber %] [% USE Branches %] [% PROCESS 'member-main-address-style.inc' %] [% PROCESS 'member-alt-address-style.inc' %] @@ -1379,9 +1380,9 @@ [% PROCESS restriction_type_description restriction_type=restriction.type %] [% IF restriction.comment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %] + Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | scrub_html type => 'comment' | $raw %] [% ELSE %] - [% restriction.comment | $raw %] + [% restriction.comment | scrub_html type => 'comment' | $raw %] [% END %] @@ -1552,7 +1553,6 @@ [% END %] [% END # /UNLESS ( no_add ) %] [% END %] -