Bugzilla – Attachment 129356 Details for
Bug 29287
Display of funds on acquisitions home is not consistent with display on funds page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29287: Add child funds to display of parent funds on acqui home
Bug-29287-Add-child-funds-to-display-of-parent-fun.patch (text/plain), 4.70 KB, created by
Andrew Fuerste-Henry
on 2022-01-12 17:15:06 UTC
(
hide
)
Description:
Bug 29287: Add child funds to display of parent funds on acqui home
Filename:
MIME Type:
Creator:
Andrew Fuerste-Henry
Created:
2022-01-12 17:15:06 UTC
Size:
4.70 KB
patch
obsolete
>From eb29c506b92deff69e1b6c938af5cebfd218218b Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 20 Oct 2021 18:47:01 +0000 >Subject: [PATCH] Bug 29287: Add child funds to display of parent funds on > acqui home > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> >--- > acqui/acqui-home.pl | 2 ++ > .../prog/en/modules/acqui/acqui-home.tt | 32 +++++++++++++++---- > 2 files changed, 28 insertions(+), 6 deletions(-) > >diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl >index 3010c6a3a3..05eb16bf06 100755 >--- a/acqui/acqui-home.pl >+++ b/acqui/acqui-home.pl >@@ -95,6 +95,8 @@ foreach my $budget ( @{$budget_arr} ) { > } > $budget->{'budget_avail'} = > $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} ); >+ $budget->{'total_avail'} = >+ $budget->{'budget_amount'} - ( $budget->{'total_spent'} + $budget->{'total_ordered'} ); > > $total += $budget->{'budget_amount'}; > $totspent += $budget->{'budget_spent'}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 833c27a020..f2853fcfe4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -159,16 +159,36 @@ > </td> > <td class="data"> > <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >- <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span> >- </a> >+ [% IF !loop_budge.budget_parent_id %] >+ <a title="Ordered from this fund" href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >+ (<span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span>) >+ </a> >+ <span title="Ordered from this fund and children" class="inclusive_amount">[% loop_budge.total_ordered | $Price %]</span> >+ [% ELSE %] >+ <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >+ <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span> >+ </a> >+ [% END %] > </td> > <td class="data"> >- <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >- <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span> >- </a> >+ [% IF !loop_budge.budget_parent_id %] >+ <a title="Spent from this fund" href="spent.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >+ (<span class="total_amount">[% loop_budge.budget_spent | $Price %]</span>) >+ </a> >+ <span title="Spent from this fund and children" class="inclusive_amount">[% loop_budge.total_spent | $Price %]</span> >+ [% ELSE %] >+ <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> >+ <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span> >+ </a> >+ [% END %] > </td> > <td class="data"> >- <span class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span> >+ [% IF !loop_budge.budget_parent_id %] >+ (<span title="Remaining in this fund" class="parent_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span>) >+ <span title="Remaining with child funds included" class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.total_avail | $Price %]</span> >+ [% ELSE %] >+ <span class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span> >+ [% END %] > </td> > </tr> > [% END %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29287
:
126595
|
129356
|
130410
|
130963