[freeside-commits] branch master updated. 7e025dc076379f89e91803ec58d1a0d95cb02d1f

[Ivan]

The branch, master has been updated
       via  7e025dc076379f89e91803ec58d1a0d95cb02d1f (commit)
      from  300ff26285e8de055a71d11df5d2954d5837a6b2 (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 7e025dc076379f89e91803ec58d1a0d95cb02d1f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jun 2 14:22:22 2017 -0700

    separate ACL for editing customer invoice terms, RT#75759

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 640eee3..23d54b6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -377,6 +377,10 @@ sub insert {
        join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
     if $DEBUG;
 
+  return "You are not permitted to change customer invoicing terms."
+    if $self->invoice_terms #i.e. not the default
+    && ! $FS::CurrentUser::CurrentUser->access_right('Edit customer invoice terms');
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -1385,6 +1389,10 @@ sub replace {
     && ! $self->locale
     && $conf->exists('cust_main-require_locale');
 
+  return "You are not permitted to change customer invoicing terms."
+    if $old->invoice_terms ne $self->invoice_terms
+    && ! $curuser->access_right('Edit customer invoice terms');
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';

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

Summary of changes:
 FS/FS/cust_main.pm |    8 ++++++++
 1 file changed, 8 insertions(+)