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

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 2d95953..9649e5e 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -109,6 +109,7 @@ tie my %rights, 'Tie::IxHash',
     'Edit customer',
     'Edit customer tags',
     'Edit referring customer',
+    'Edit customer invoice terms',
     'View customer history',
     'Suspend customer',
     'Unsuspend customer',

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index f1614ff..29c91b0 100644 (file)
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -259,6 +259,7 @@ sub _upgrade_data { # class method
     'Resend invoices' => 'Print and mail invoices',
     'List customers' => 'Customers: Customer churn report',
     'Edit customer note' => 'Delete customer note',
+    'Edit customer' => 'Edit customer invoice terms',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {