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

[freeside.git] / FS / FS / AccessRight.pm

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 95cf29a..471e32a 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',
@@ -143,6 +144,7 @@ tie my %rights, 'Tie::IxHash',
     'Cancel customer package later',
     'Un-cancel customer package',
     'Delay suspension events',
+    'Customize billing during suspension',
     'Add on-the-fly cancel reason', #NEW
     'Add on-the-fly suspend reason', #NEW
     'Edit customer package invoice details', #NEW
@@ -152,6 +154,8 @@ tie my %rights, 'Tie::IxHash',
     'View appointments', #NEWNEW
     'Make appointment',
     'View package definition costs', #NEWNEW
+    'Change package start date',
+    'Change package contract end date',
   ],
   
   ###
@@ -182,6 +186,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer invoice / financial info rights' => [
     'View invoices',
     'Resend invoices', #NEWNEW
+    { rightname=>'Print and mail invoices', desc=>"Print and mail via Freeside's web service", }, ##NEWER than NEWNEWNEW
     'Void invoices',
     'Unvoid invoices',
     'View customer tax exemptions', #yow
@@ -232,7 +237,7 @@ tie my %rights, 'Tie::IxHash',
     'Refund Echeck payment',
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
-    'Add on-the-fly void credit reason',
+    'Add on-the-fly void reason',
     'Add on-the-fly refund reason', #NEW
   ],
   
@@ -254,6 +259,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer note and attachment rights' => [
     'Add customer note', #NEW
     'Edit customer note', #NEW
+    'Delete customer note', #NEWEST
     'View attachments', #NEW
     'Browse attachments', #NEW
     'Download attachment', #NEW
@@ -285,6 +291,7 @@ tie my %rights, 'Tie::IxHash',
     { rightname=> 'List rating data', desc=>'Usage reports', global=>1 },
     'Billing event reports',
     'Receivables report',
+    'Basic payment and refund reports',
     'Financial reports',
     { rightname=>'Send reports to customers', global=>1 },
     { rightname=> 'List inventory', global=>1 },
@@ -292,6 +299,7 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'View system logs' },
 
     'Download report data',
+    'Customers: Customer churn report',
     'Services: Accounts',
     'Services: Accounts: Advanced search',
     'Services: Domains',
@@ -314,13 +322,15 @@ tie my %rights, 'Tie::IxHash',
     'Services: Alarm services',
     'Services: Video',
     'Services: Circuits',
+    'Services: Fiber',
+    'Services: Fiber: Advanced search',
     'Services: External services',
     'Usage: RADIUS sessions',
     'Usage: Call Detail Records (CDRs)',
     'Usage: Unrateable CDRs',
     'Usage: Time worked',
     #gone in 4.x as a distinct ACL (for now?) { rightname=>'Employees: Commission Report', global=>1 },
-    { rightname=>'Employees: Audit Report', global=>1 },
+    { rightname=>'Employee Reports', global=>1 },
 
     #{ rightname => 'List customers of all agents', global=>1 },
   ],
@@ -353,6 +363,10 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'Employee preference telephony integration' },
   #]
 
+  #'RT preference rights' => [
+    { rightname=>'RT activity notification' },
+  #]
+
   ],
   
   ###