diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index d34f3324ee..6a6786fd33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1872,6 +1872,9 @@ ul.budget_hierarchy li:last-child:after {
ul.budget_hierarchy li:first-child:after {
content: "";
}
+.child_fund_amount {
+ font-style: italic;
+}
.holdcount { font-size : 105%; line-height : 200%; }
.holdcount a {
border : 1px solid #a4bedd;
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 1a88548452..6c63e1262e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -278,35 +278,35 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
[% budge.budget_name %] |
[% IF budge.budget_parent_id %]
- [% budge.budget_amount %]
+ [% budge.budget_amount %]
[% ELSE %]
[% budge.budget_amount %]
[% END %]
|
[% IF budge.budget_parent_id %]
- [% budge.budget_ordered %]
+ [% budge.budget_ordered %]
[% ELSE %]
[% budge.budget_ordered %]
[% END %]
|
[% IF budge.budget_parent_id %]
- [% budge.total_ordered %]
+ [% budge.total_ordered %]
[% ELSE %]
[% budge.total_ordered %]
[% END %]
|
[% IF budge.budget_parent_id %]
- [% budge.budget_spent %]
+ [% budge.budget_spent %]
[% ELSE %]
[% budge.budget_spent %]
[% END %]
|
[% IF budge.budget_parent_id %]
- [% budge.total_spent %]
+ [% budge.total_spent %]
[% ELSE %]
[% budge.total_spent %]
[% END %]
@@ -314,21 +314,31 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
[% BLOCK colorcellvalue %]
- [% IF (value > 0) %]
-
- [% ELSIF (value < 0) %]
-
- [% ELSE %]
-
+ [% IF parent %]
+ [% IF (value > 0) %]
+
+ [% ELSIF (value < 0) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% ELSE %]
+ [% IF (value > 0) %]
+
+ [% ELSIF (value < 0) %]
+
+ [% ELSE %]
+
+ [% END %]
[% END %]
[% text %]
[% END %]
|
- [% INCLUDE colorcellvalue value=budge.budget_remaining text=budge.budget_remaining_display %]
+ [% INCLUDE colorcellvalue value=budge.budget_remaining text=budge.budget_remaining_display parent=budge.budget_parent_id %]
|
- [% INCLUDE colorcellvalue value=budge.total_remaining text=budge.total_remaining_display %]
+ [% INCLUDE colorcellvalue value=budge.total_remaining text=budge.total_remaining_display parent=budge.budget_parent_id %]
|
[% IF ( budge.budget_owner_id ) %]Owner: [% budge.budget_owner_name %][% END %]
|