X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=666099a02b6855ae86533d231d80dec68b3cd62c;hp=e05205ba7190d52d449f23ba022099a3786488f1;hb=06a85a88bfdb0d3fc79ee055eb8327658dfe63ab;hpb=d6be23266fb627a4e7831055bf55ae675dbad4e9

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index e05205ba7..666099a02 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -60,7 +60,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "start_date_text",
-    ifFormat:   "%m/%d/%Y",
+    ifFormat:   "<% $date_format %>",
     button:     "start_date_button",
     align:      "BR"
   });
@@ -69,6 +69,8 @@
 % if ( $curuser->access_right('Discount customer package') ) {
   <% include('/elements/tr-select-discount.html',
                'element_etc' => 'DISABLED',
+               'colspan'     => 7,
+               'cgi'         => $cgi,
             )
   %>
 % }
@@ -105,6 +107,7 @@ die "access denied"
   unless $curuser->access_right('Order customer package');
 
 my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 $cgi->param('custnum') =~ /^(\d+)$/ or die "no custnum";
 my $custnum = $1;