From 96d050547a81eddc27621098f82b3b69c5395934 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>

Signed-off-by: Michael Sutherland <sudrland@vt.edu>

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit bfecc7bff27000416fd1c91e64e0edd8c67b1ab7)

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 66572f0b99..f3625250d3 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -98,6 +98,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 %]&amp;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 %]&amp;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 %]&amp;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 %]&amp;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 %]&amp;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 %]&amp;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.39.5