[freeside-commits] branch master updated. b3495184423119719067c5438a0f09eabda16306

[Ivan]

The branch, master has been updated
       via  b3495184423119719067c5438a0f09eabda16306 (commit)
       via  9f84e0efea1f0fcfce3139519f2b75898f3255b0 (commit)
       via  de7cfa5739065686951753a1196e002cddcb744a (commit)
      from  1271e8451691de07d167402e93ebde8efd902c84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3495184423119719067c5438a0f09eabda16306
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 6 11:34:24 2013 -0700

    fix error display on invoice voids, RT#23453

diff --git a/httemplate/misc/process/void-cust_bill.html b/httemplate/misc/process/void-cust_bill.html
index 899901a..accee27 100755
--- a/httemplate/misc/process/void-cust_bill.html
+++ b/httemplate/misc/process/void-cust_bill.html
@@ -1,6 +1,6 @@
 %if ( $error ) {
 %  $cgi->param('error', $error);
-<% $cgi->redirect(popurl(1). "void-cust_bill.html?". $cgi->query_string ) %>
+<% $cgi->redirect(popurl(2). "void-cust_bill.html?". $cgi->query_string ) %>
 %} else {
 <& /elements/header-popup.html, 'Invoice voided' &>
 <SCRIPT TYPE="text/javascript">

commit 9f84e0efea1f0fcfce3139519f2b75898f3255b0
Merge: de7cfa5 1271e84
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 6 11:34:22 2013 -0700

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


commit de7cfa5739065686951753a1196e002cddcb744a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 5 22:52:50 2013 -0700

    remove echeck-nonus

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7e835a2..c85e4a5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3407,13 +3407,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'echeck-nonus',
-    'section'     => 'billing',
-    'description' => 'Disable ABA-format account checking for Electronic Check payment info',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'echeck-country',
     'section'     => 'billing',
     'description' => 'Format electronic check information for the specified country.',

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                               |    7 -------
 httemplate/misc/process/void-cust_bill.html |    2 +-
 2 files changed, 1 insertions(+), 8 deletions(-)