From 3cf367f50f022a6979ff57a721056d5d7a80fff2 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 7 Oct 2019 17:19:27 +0000 Subject: [PATCH] Bug 23767: Include child funds in total spent and ordered on acqui-home MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: 1 - Have three funds, two parents and one child 2 - Open a basket and add an order to each fund 3 - View acqui-home.pl 4 - Note that ordered values are only added from the two parent funds 5 - Complete these orders (close basket, receive) 6 - Note the spent only includes parent funds 7 - Place three more orders, one from each fund 8 - Now you can see both spent and ordered are incorrect 9 - Apply patch 10 - Reload, all should add correctly Signed-off-by: Martin Renvoize Signed-off-by: Séverine QUEUNE Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 07150a0a850845e8ff16bee6f85fdc74d510ec5e) Signed-off-by: Fridolin Somers (cherry picked from commit 8c4eb57c1789b5f86ee979b7e1577c4eb8755769) Signed-off-by: Andrew Fuerste-Henry --- .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 8 -------- 1 file changed, 8 deletions(-) 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 b64911f96a..b52d758533 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 @@ -142,20 +142,12 @@ - [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_ordered | $Price %] - [% ELSE %] [% loop_budge.budget_ordered | $Price %] - [% END %] - [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_spent | $Price %] - [% ELSE %] [% loop_budge.budget_spent | $Price %] - [% END %] -- 2.39.5