better error handling in google export, #12064

[freeside.git] / httemplate / edit / cust_credit.cgi

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 5785a05..d5e53b8 100755 (executable)
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -10,17 +10,16 @@
 <INPUT TYPE="hidden" NAME="credited" VALUE="">
 <INPUT TYPE="hidden" NAME="otaker" VALUE="<% $otaker %>">
 
-Credit
 <% ntable("#cccccc", 2) %>
 
   <TR>
     <TD ALIGN="right">Date</TD>
-    <TD BGCOLOR="#ffffff"><% time2str("%D",$_date) %></TD>
+    <TD BGCOLOR="#ffffff"><% time2str($date_format, $_date) %></TD>
   </TR>
 
   <TR>
     <TD ALIGN="right">Amount</TD>
-    <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="amount" VALUE="<% $amount |h %>" SIZE=8 MAXLENGTH=8></TD>
+    <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="amount" VALUE="<% $amount |h %>" SIZE=8 MAXLENGTH=9></TD>
   </TR>
 
 %
@@ -36,9 +35,19 @@ Credit
 %>
 
   <TR>
+    <TD ALIGN="right">Additional info</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="addlinfo" VALUE="<% $cgi->param('addlinfo') |h %>">
+    </TD>
+
+% if ( $conf->exists('credits-auto-apply-disable') ) {
+        <INPUT TYPE="HIDDEN" NAME="apply" VALUE="no">
+% } else {
+  <TR>
     <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
     <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
   </TR>
+% }
 
 % if ( $conf->exists('pkg-balances') ) {
   <% include('/elements/tr-select-cust_pkg-balances.html',
@@ -59,12 +68,10 @@ Credit
 </FORM>
 </BODY>
 </HTML>
-<%once>
+<%init>
 
 my $conf = new FS::Conf;
-
-</%once>
-<%init>
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Post credit');