X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FAccessRight.pm;h=6c06ec2f3f098152b3749a8ad1f93bdb9244a99f;hp=1e1b9ead3b73e3e36ae5a8c12a81694b8e6d6042;hb=a8e4b1744a6bbd2e1509b58e73b1d52751563880;hpb=8966833a87b9a002c9d72c56832e35b55628dc81

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 1e1b9ead3..6c06ec2f3 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -108,10 +108,12 @@ tie my %rights, 'Tie::IxHash',
     'View customer',
     #'View Customer | View tickets',
     'Edit customer',
+    'Edit customer tags',
     'Edit referring customer',
     'View customer history',
     'Cancel customer',
     'Complimentary customer', #aka users-allow_comp 
+    'Merge customer',
     { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers
     'Bill customer now', #NEW
     'Bulk send customer notices', #NEW
@@ -288,6 +290,9 @@ tie my %rights, 'Tie::IxHash',
     'Edit billing events',
     { rightname=>'Edit global billing events', global=>1 },
 
+    'Edit templates',
+    { rightname=>'Edit global templates', global=>1 },
+
     'Edit inventory',
     { rightname=>'Edit global inventory', global=>1 },
   
@@ -342,6 +347,7 @@ sub default_superuser_rights {
     'Redownload resolved batches',
     'Raw SQL',
     'Configuration download',
+    'View customers of all agents',
   );
 
   no warnings 'uninitialized';