[freeside-commits] branch master updated. e04a3713495d513d4216f9bf98ac8e006dfbb032

[Ivan]

The branch, master has been updated
       via  e04a3713495d513d4216f9bf98ac8e006dfbb032 (commit)
       via  0fda4498e5b48587090b03d40ea97fec1e024385 (commit)
       via  5becafa6dfc3ee7c0f07543904f0f3e25aa64949 (commit)
      from  748dfad30d5e3861773b72369bf074ddc02ac72b (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 e04a3713495d513d4216f9bf98ac8e006dfbb032
Merge: 748dfad 0fda449
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 3 11:27:23 2015 -0700

    Merge branch 'fozzmoo-20150325-cust_main-CurrentUser'


commit 0fda4498e5b48587090b03d40ea97fec1e024385
Merge: 748dfad 5becafa
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 3 11:24:16 2015 -0700

    Merge branch '20150325-cust_main-CurrentUser' of https://github.com/fozzmoo/Freeside into fozzmoo-20150325-cust_main-CurrentUser


commit 5becafa6dfc3ee7c0f07543904f0f3e25aa64949
Author: Doran L. Barton <fozz at iodynamics.com>
Date:   Wed Mar 25 14:48:06 2015 -0600

    Fixed bug: Replaced $FS::CurrentUser->CurrentUser with $FS::CurrentUser::CurrentUser

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 74433d7..a9d7ac7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1856,7 +1856,7 @@ sub check {
   return "You are not permitted to create complimentary accounts."
     if ! $self->custnum
     && $self->complimentary eq 'Y'
-    && ! $FS::CurrentUser->CurrentUser->access_right('Complimentary customer');
+    && ! $FS::CurrentUser::CurrentUser->access_right('Complimentary customer');
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expiration date required"

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

Summary of changes:
 FS/FS/cust_main.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)