Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined httemplate/edit/process/cust_pay.cgi
index 9e5f3d3,d85267c..15b26f9
--- 1/httemplate/edit/process/cust_pay.cgi
--- 2/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@@ -14,7 -14,7 +14,7 @@@
  %    
  <% header(emt('Payment entered')) %>
      <SCRIPT TYPE="text/javascript">
-       window.top.location.reload();
+       topreload();
      </SCRIPT>
  
      </BODY></HTML>
@@@ -69,6 -69,6 +69,6 @@@ push @rights, 'Post cash payment'  if $
  die "access denied"
    unless $FS::CurrentUser::CurrentUser->access_right(\@rights);
  
 -my $error ||= $new->insert( 'manual' => 1 );
 +my $error = $new->insert( 'manual' => 1 );
  
  </%init>