X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fdelay_susp_pkg.html;h=e5f1d8cb3ccf008ccd78c30019369035daba65d5;hb=2b038fbfe3d8df457208123fb46ff27575a7d872;hp=d4a6da18f4b5e41001a24b7afc44820fbd64613c;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/misc/delay_susp_pkg.html b/httemplate/misc/delay_susp_pkg.html
index d4a6da18f..e5f1d8cb3 100755
--- a/httemplate/misc/delay_susp_pkg.html
+++ b/httemplate/misc/delay_susp_pkg.html
@@ -25,7 +25,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "dun_date",
-    ifFormat:   "%m/%d/%Y",
+    ifFormat:   "<% $date_format %>",
     button:     "dun_button",
     align:      "BR"
   });
@@ -42,7 +42,10 @@
 
 <%init>
 
-my $date = time2str("%m/%d/%Y", time);
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $date = time2str($date_format, time);
 
 my($pkgnum);
 if ( $cgi->param('error') ) {
@@ -65,6 +68,10 @@ my $title = 'Delay Suspension of Package';
 my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum})
   or die "Unknown pkgnum: $pkgnum";
 
+$date = time2str($date_format, $cust_pkg->dundate) 
+  if $cust_pkg->dundate
+  && ! $cgi->param('error');
+
 my $part_pkg = $cust_pkg->part_pkg;
 
 </%init>