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 4514ccb..d2417f0 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -253,9 +253,11 @@ tie my %rights, 'Tie::IxHash',
   ###
   'Reporting/listing rights' => [
     'List customers',
+    'List all customers',
     'List zip codes', #NEW
     'List invoices',
     'List packages',
+    'Summarize packages',
     'List services',
     'List service passwords',
   
@@ -264,6 +266,9 @@ tie my %rights, 'Tie::IxHash',
     'Receivables report',
     'Financial reports',
     { rightname=> 'List inventory', global=>1 },
+    { rightname=>'View email logs', global=>1 },
+
+    'Download report data',
 
     #{ rightname => 'List customers of all agents', global=>1 },
   ],
@@ -274,7 +279,8 @@ tie my %rights, 'Tie::IxHash',
   'Miscellaneous rights' => [
     { rightname=>'Job queue', global=>1 },
     { rightname=>'Time queue', global=>1 },
-    { rightname=>'Process batches', global=>1 }, #Process payment batches
+    { rightname=>'Process batches', }, #Process payment batches
+    { rightname=>'Process global batches', global=>1 }, #Process global payment batches
     { rightname=>'Reprocess batches', global=>1 }, #Reprocess payment batches
     { rightname=>'Redownload resolved batches', global=>1 }, #Redownload resolved payment batches
     { rightname=>'Process invoice batches', },
@@ -359,6 +365,7 @@ sub default_superuser_rights {
     'Delete payment',
     'Delete credit', #?
     'Delete refund', #?
+    'Edit customer package dates',
     'Time queue',
     'Redownload resolved batches',
     'Raw SQL',
@@ -366,6 +373,8 @@ sub default_superuser_rights {
     'View customers of all agents',
     'View/link unlinked services',
     'Edit usage',
+    'Credit card void',
+    'Echeck void',
   );
 
   no warnings 'uninitialized';