Merge branch 'master' of https://github.com/jgoodman/Freeside

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

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index ca96eb5..4d9cff9 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -230,13 +230,14 @@ tie my %rights, 'Tie::IxHash',
     'Refund Echeck payment',
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
+    'Add on-the-fly refund reason', #NEW
   ],
   
   ###
   # customer voiding rights..
   ###
   'Customer payment void rights' => [
-    { rightname=>'Credit card void', desc=>'Enable local-only voiding of echeck payments in addition to refunds against the payment gateway.' }, #aka. cc-void 
+    { rightname=>'Credit card void', desc=>'Enable local-only voiding of credit card payments in addition to refunds against the payment gateway.' }, #aka. cc-void 
     { rightname=>'Echeck void', desc=>'Enable local-only voiding of echeck payments in addition to refunds against the payment gateway.' }, #aka. echeck-void
     'Void payments',
     { rightname=>'Unvoid payments', desc=>'Enable unvoiding of voided payments' }, #aka. unvoid 
@@ -295,6 +296,7 @@ tie my %rights, 'Tie::IxHash',
     'Services: Wireless broadband services: Advanced search',
     'Services: DSLs',
     'Services: Cable subscribers',
+    'Services: Conferencing',
     'Services: Dish services',
     'Services: Hardware',
     'Services: Hardware: Advanced search',
@@ -304,12 +306,13 @@ tie my %rights, 'Tie::IxHash',
     'Services: Ports',
     'Services: Mailing lists',
     'Services: Alarm services',
+    'Services: Video',
     'Services: External services',
     'Usage: RADIUS sessions',
     'Usage: Call Detail Records (CDRs)',
     'Usage: Unrateable CDRs',
     'Usage: Time worked',
-    { rightname=>'Employees: Commission Report', global=>1 },
+    #gone in 4.x as a distinct ACL (for now?) { rightname=>'Employees: Commission Report', global=>1 },
     { rightname=>'Employees: Audit Report', global=>1 },
 
     #{ rightname => 'List customers of all agents', global=>1 },
@@ -350,9 +353,13 @@ tie my %rights, 'Tie::IxHash',
 
     'Edit package definitions',
     { rightname=>'Edit global package definitions', global=>1 },
-  
+    'Edit package definition costs',
+
     'Bulk edit package definitions',
 
+    'Edit fee definitions',
+    { rightname=>'Edit global fee definitions', global=>1 },
+
     'Edit billing events',
     { rightname=>'Edit global billing events', global=>1 },
 
@@ -369,7 +376,10 @@ tie my %rights, 'Tie::IxHash',
 
     { rightname=>'Broadband configuration' },
     { rightname=>'Broadband global configuration', global=>1 },
-    
+
+    { rightname=>'Alarm configuration' },
+    { rightname=>'Alarm global configuration', global=>1 },
+
     { rightname=> 'Configure network monitoring', global=>1 },
 
     #{ rightname=>'Edit employees', global=>1, },