From 25e0c92360645f75b672f9713b9bab31c081d24e Mon Sep 17 00:00:00 2001
From: Maxime Pelletier <maxime.pelletier@libeo.com>
Date: Wed, 30 May 2012 13:49:34 -0400
Subject: [PATCH] Bug 8663 Fix the use of hardcoded date format for the
 calendar widget of hard due date

Sponsored by the CCSR

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created circulation rules with different dateformat settings and hardduedate settings.
After applying the patch the calendar produces the correct fomats and rules are saved correctly.
Checking out an item to the hardduedate set works too.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 admin/smart-rules.pl                                         | 3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 8e5a2d5802..d20892214f 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -498,7 +498,8 @@ $template->param(categoryloop => \@category_loop,
                         branchloop => \@branchloop,
                         humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''),
                         current_branch => $branch,
-                        definedbranch => scalar(@sorted_row_loop)>0 
+                        definedbranch => scalar(@sorted_row_loop)>0,
+                        DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar()
                         );
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 635051ff3c..98e3ef5de6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -172,7 +172,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                              Calendar.setup(
                              {
                              inputField : "hardduedate",
-                             ifFormat : "%m/%d/%Y",
+                             ifFormat : "[% DHTMLcalendar_dateformat %]",
                              button : "CalendarDueDate",
                              onClose: refocus
                              }
-- 
2.39.5