use syspref date format for manual due date

NOTE: will fail if user manages to enter date
in wrong format.  This is not a change from before
this patch, but is pointed out.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 2fad429..e1f3e50 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -133,7 +133,7 @@ my $newexpiry = $query->param('dateexpiry');
 
 my ($datedue,$invalidduedate);
 if ($duedatespec) {
-       $datedue =  C4::Dates->new($duedatespec,'iso' );
+       $datedue =  C4::Dates->new($duedatespec);
        $invalidduedate=1 unless $datedue;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index d4ac1d5..a10961a 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -226,7 +226,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                      Calendar.setup(
                           {
                              inputField : "duedatespec",
-                             ifFormat : "%Y-%m-%d",
+                             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                              button : "CalendarDueDate",
                              disableFunc : validate1,
                              dateStatusFunc : validate1,