[freeside-commits] branch FREESIDE_3_BRANCH updated. 6cdabc5d8aeacd57a603bfe85b83898e8370db17
Ivan
ivan at 420.am
Thu Jun 6 11:34:28 PDT 2013
The branch, FREESIDE_3_BRANCH has been updated
via 6cdabc5d8aeacd57a603bfe85b83898e8370db17 (commit)
via b6f044c11390e856caff9996e8c052e3086a482b (commit)
via 8f90756a88b7326dc01bfc9b6d73958e65f84629 (commit)
from 3db6956f45d19e9f5d8704a2b3bd75bbd6f97947 (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 6cdabc5d8aeacd57a603bfe85b83898e8370db17
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jun 6 11:34:27 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 b6f044c11390e856caff9996e8c052e3086a482b
Merge: 8f90756 3db6956
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jun 6 11:34:11 2013 -0700
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
commit 8f90756a88b7326dc01bfc9b6d73958e65f84629
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jun 5 22:52:27 2013 -0700
deprecate echeck-nonus, its already unused and migrated to echeck-country
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 4e16459..1fc419a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3415,8 +3415,8 @@ and customer address. Include units.',
{
'key' => 'echeck-nonus',
- 'section' => 'billing',
- 'description' => 'Disable ABA-format account checking for Electronic Check payment info',
+ 'section' => 'deprecated',
+ 'description' => 'Deprecated; see echeck-country instead. Used to disable ABA-format account checking for Electronic Check payment info',
'type' => 'checkbox',
},
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 4 ++--
httemplate/misc/process/void-cust_bill.html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
More information about the freeside-commits
mailing list