From e863f6645e9cfef851066e3bd96145969202ab8d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 28 Dec 2015 10:26:10 +0000
Subject: [PATCH]  Bug 15049: Simplify code in aqplan.tt

There was no need to duplicate this code in the template.
The only change with before this patch is that the "Currency = CUR"
and "Each cell contain both actual and estimated values." are now
displayed on 2 lines instead of 1.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 .../prog/en/modules/admin/aqplan.tt              | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 86a196251b..988f88a47b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -85,21 +85,13 @@
 
     [% IF ( budget_lines ) %]
 
-    [% IF ( currency ) %]<p><b>Currency = [% currency %].</b>
+        [% INCLUDE 'budgets-active-currency.inc' %]
         [% IF ( show_actual ) %]
-            <b>Each cell contain both actual and estimated values.</b>
+            <p><b>Each cell contain both actual and estimated values.</b></p>
         [% ELSE %]
-            <b>Cells contain estimated values only.</b>
+            <p><b>Cells contain estimated values only.</b></p>
         [% END %]
-        </p>
-    [% ELSE %]
-        [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
-[% IF ( show_actual ) %]
-        <p><b>Each cell contain both actual and estimated values.</b></p>
-    [% ELSE %]
-        <p><b>Cells contain estimated values only.</b></p>
-    [% END %]
-    [% END %]
+
     <p id="selections">
         <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
         [% FOREACH authvals_ro IN authvals_row %]
-- 
2.39.5