From 6e2e58107f2347ec87281414fb0e5e12bf7806bf Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 19 Jul 2011 02:08:52 -0400
Subject: [PATCH] Fix for Bug 6608 - Date-pickers broken on guided reports
 pages

Template variable scope errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/reports/dictionary.tt     | 4 ++--
 .../prog/en/modules/reports/guided_reports_start.tt         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
index c4a8da5c42..f6d48ba56f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
@@ -214,7 +214,7 @@
 <script type="text/javascript">                            
 Calendar.setup({             
 inputField     : "[% column.name %]_start_value",    
-ifFormat       : "[% column.DHTMLcalendar_dateformat %]",
+ifFormat       : "[% DHTMLcalendar_dateformat %]",
 button         : "buttonfrom1",                            
 align          : "Tl"                  
 });
@@ -230,7 +230,7 @@ align          : "Tl"
 <script type="text/javascript">                            
 Calendar.setup({             
 inputField     : "[% column.name %]_end_value",    
-ifFormat       : "[% column.DHTMLcalendar_dateformat %]",
+ifFormat       : "[% DHTMLcalendar_dateformat %]",
 button         : "buttonfrom2",
 align          : "Tl"                  
 });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 0c1767b2d8..e3df4e22af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -331,7 +331,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
             Calendar.setup({  
             inputField     : "[% criteri.name %]_value",
-            ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+            ifFormat       : "[% DHTMLcalendar_dateformat %]",
             button         : "buttonfrom[% criteri.name %]",
             align          : "Tl" 
             });     
@@ -354,7 +354,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
                 Calendar.setup({  
                 inputField     : "from_[% criteri.name %]_value",
-                ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+                ifFormat       : "[% DHTMLcalendar_dateformat %]",
                 button         : "buttonfromfrom_[% criteri.name %]",
                 align          : "Tl" 
                 });     
@@ -365,7 +365,7 @@ canned reports and writing custom SQL reports.</p>
             <script type="text/javascript">   
                 Calendar.setup({  
                 inputField     : "to_[% criteri.name %]_value",
-                ifFormat       : "[% criteri.DHTMLcalendar_dateformat %]",
+                ifFormat       : "[% DHTMLcalendar_dateformat %]",
                 button         : "buttonfromto_[% criteri.name %]",
                 align          : "Tl" 
                 });     
-- 
2.20.1