[freeside-commits] branch master updated. 94be7e58a807d822aaa34151c5da9346c976d7a0

[Ivan Kohler]

The branch, master has been updated
       via  94be7e58a807d822aaa34151c5da9346c976d7a0 (commit)
       via  d6972edb74552fd097714121a8cc450b7d40bdbc (commit)
      from  5c1e57f696a330f82231b485fe58491f537e587b (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 94be7e58a807d822aaa34151c5da9346c976d7a0
Merge: d6972edb7 5c1e57f69
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Dec 15 16:43:57 2017 -0800

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


commit d6972edb74552fd097714121a8cc450b7d40bdbc
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Dec 15 16:43:48 2017 -0800

    fix changing employee password, RT#78939

diff --git a/FS/FS/Password_Mixin.pm b/FS/FS/Password_Mixin.pm
index 122e3fd83..b29cf5713 100644
--- a/FS/FS/Password_Mixin.pm
+++ b/FS/FS/Password_Mixin.pm
@@ -82,7 +82,9 @@ sub is_password_allowed {
   return '' unless $self->get($self->primary_key); # for validating new passwords pre-insert
 
   #check against customer fields
-  my $cust_main = $self->cust_main;
+  my $cust_main = $self->table eq 'access_user'
+                    ? $self->user_cust_main
+                    : $self->cust_main;
   if ($cust_main) {
     my @words;
     # words from cust_main

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

Summary of changes:
 FS/FS/Password_Mixin.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)