2 files changed, 10 insertions, 6 deletions

diff --git a/httemplate/elements/customer-table.html b/httemplate/elements/customer-table.html
index 8564c31e2..9968ee9aa 100644
--- a/httemplate/elements/customer-table.html
+++ b/httemplate/elements/customer-table.html
@@ -128,7 +128,7 @@ Example:
         custnum_obj.value = customerArray[0];
         custnum_obj.style.color = '#000000';
         customer.value = customerArray[1];
-        balance.innerHTML = customerArray[2];
+        balance.innerHTML = customerArray[2] + '   ';
         status.innerHTML = customerArray[3]; 
         status.style.color = '#'+customerArray[4];
 
@@ -205,7 +205,7 @@ Example:
         custnum_obj.value = customerArray[0];
         custnum_obj.style.color = '#000000';
         customer.value = customerArray[1];
-        balance.innerHTML = customerArray[2];
+        balance.innerHTML = customerArray[2] + '   ';
         status.innerHTML = customerArray[3]; 
         status.style.color = '#'+customerArray[4];
 
@@ -277,7 +277,7 @@ Example:
 
         custnum_obj.value = customerArray[0][0];
         customer_obj.value = customerArray[0][1];
-        balance.innerHTML = customerArray[0][2];
+        balance.innerHTML = customerArray[0][2] + '   ';
         status.innerHTML = customerArray[0][3]; 
         status.style.color = '#'+customerArray[0][4];
 
@@ -345,7 +345,7 @@ Example:
       var pos_underscore2 = custnum_balance_status.indexOf('_',pos_underscore1+1); 
       var pos_underscore3 = custnum_balance_status.indexOf('_',pos_underscore2+1); 
       var custnum = custnum_balance_status.substring(0,pos_underscore1);
-      var balance = custnum_balance_status.substring(pos_underscore1+1,pos_underscore2);
+      var balance = custnum_balance_status.substring(pos_underscore1+1,pos_underscore2) + '   ';
       var status = custnum_balance_status.substring(pos_underscore2+1,pos_underscore3);
       var color = custnum_balance_status.substring(pos_underscore3+1);
 
@@ -502,6 +502,7 @@ Example:
                rownum    = "<% $row %>"
         >
         </SPAN>
+        &nbsp;
       </TD>
     </TR>
 % } 
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index c5ed6d852..20ea92f37 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -96,14 +96,17 @@ function select_discount_term(row, prefix) {
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Post payment batch');
 
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
 my @header  = ( '', 'Amount', 'Check #' );
-my @fields  = ( sub {'$'}, 'paid', 'payinfo' );
+my @fields  = ( sub { "$money_char" }, 'paid', 'payinfo' );
 my @types   = ( 'immutable', '', '' );
 my @align   = ( 'c', 'r', 'r' );
 my @sizes   = ( 0, 8, 10 );
 my @colors  = ( '', '', '' );
 my %param   = ();
-my @footer  = ( '$', '_TOTAL', '' );
+my @footer  = ( "$money_char", '_TOTAL', '' );
 my @footer_align = ( 'c', 'r', 'r' );
 my $custnum_update_callback = '';