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 4a1f89a..0493edd 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -53,7 +53,6 @@ assigned to users and/or groups.
 #    'billing' => [
 #      '_desc' => 'Access to billing configuration',
 #      'payment_gateway'  => {},
-#      'part_bill_event'  => {},
 #      'prepay_credit'    => {},
 #      'rate'             => {},
 #      'cust_main_county' => {},
@@ -97,6 +96,7 @@ tie my %rights, 'Tie::IxHash',
     #'New contact',
     #'View customer contacts',
     'Generate quotation',
+    'Disable quotation',
   ],
   
   ###
@@ -192,6 +192,7 @@ tie my %rights, 'Tie::IxHash',
     'View customer pending payments', #NEW
     'Edit customer pending payments', #NEW
     'View customer billing events', #NEW
+    'View legacy typeset statements', #new, but no need to phase in
   ],
   
   ###
@@ -220,6 +221,8 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'Backdate credit', desc=>'Enable credits to be posted for days other than today.' },
     'Credit line items', #NEWNEWNEW
     'Apply credit', #NEWNEW
+    'Void credit', #NEWER than things marked NEWNEWNEW
+    'Unvoid credit', #NEWER than things marked NEWNEWNEW
     { rightname=>'Unapply credit', desc=>'Enable "unapplication" of unclosed credits.' }, #aka unapplycredits
     { rightname=>'Delete credit', desc=>'Enable deletion of unclosed credits. Be very careful!  Only delete credits that were data-entry errors, not adjustments.' }, #aka. deletecredits Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.
     'View refunds',
@@ -232,6 +235,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 refund reason', #NEW
   ],
   
@@ -345,6 +349,12 @@ tie my %rights, 'Tie::IxHash',
   ###
   #'Database access rights' => [
     { rightname=>'Raw SQL', global=>1 }, #NEW
+  #]
+
+  #'Employee preference rights' => [
+    { rightname=>'Employee preference telephony integration' },
+  #]
+
   ],
   
   ###
@@ -396,6 +406,8 @@ tie my %rights, 'Tie::IxHash',
     #{ rightname=>'Edit employees', global=>1, },
     #{ rightname=>'Edit employee groupss', global=>1, },
 
+    { rightname=>'Edit custom fields', global=>1 },
+
     { rightname=>'Configuration', global=>1 }, #most of the rest of the configuraiton is not agent-virtualized
 
     { rightname=>'Configuration download', }, #description of how it affects
@@ -446,6 +458,7 @@ sub default_superuser_rights {
     'Echeck void',
     'Void invoices',#people are overusing this when credits are more appropriate
     'Backdate credit',
+    'View legacy typeset statments',
   );
 
   no warnings 'uninitialized';