new customer report/flattened package report (ticket 1428)

[freeside.git] / httemplate / elements / menu.html

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 5675c7b..7304cbb 100644 (file)
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -66,6 +66,11 @@ tie my %report_customers_lists, 'Tie::IxHash',
 $report_customers_lists{'by active trouble tickets'} = [ $fsurl. 'search/cust_main.cgi?browse=tickets', '' ]
   if $conf->config('ticket_system');
 
+$report_customers_lists{'advanced customer reports'} = [ $fsurl. 'search/report_cust_main.html', '' ]
+  if ( $curuser->access_right('List customers') &&
+       $curuser->access_right('List packages')
+     );
+
 tie my %report_customers_search, 'Tie::IxHash';
 $report_customers_search{'by ordering employee'} = [ $fsurl. 'search/cust_main-otaker.cgi' ]
   if $curuser->access_right('Configuration');
@@ -140,7 +145,10 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
 }
 
 tie my %report_packages, 'Tie::IxHash';
-if ( $curuser->access_right('Configuration') ) {
+if (    $curuser->access_right('Edit package definitions')
+     || $curuser->access_right('Edit global package definitions')
+   )
+{
   $report_packages{'Package definitions'} =  [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ];
   $report_packages{'separator'} =  '';
 }
@@ -248,8 +256,7 @@ tie my %config_agent, 'Tie::IxHash',
 tie my %config_billing, 'Tie::IxHash',
   'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ];
 $config_billing{'View/Edit billing events'} = [ $fsurl.'browse/part_event.html', 'Billing actions for customers, invoices and packages' ]
-    if $curuser->access_right('Configuration')
-    || $curuser->access_right('Edit billing events')
+    if $curuser->access_right('Edit billing events')
     || $curuser->access_right('Edit global billing events');
 if ( $curuser->access_right('Configuration') ) {
   $config_billing{'View/Edit invoice events'}         = [ $fsurl.'browse/part_bill_event.cgi', 'Deprecated, old-style actions for overdue invoices' ];
@@ -270,8 +277,7 @@ tie my %config_broadband, 'Tie::IxHash',
 
 tie my %config_misc, 'Tie::IxHash';
 $config_misc{'View/Edit advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.  Tracked for informational purposes' ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 if ( $curuser->access_right('Configuration') ) {
   $config_misc{'View/Edit virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
@@ -291,8 +297,7 @@ if ( $curuser->access_right('Configuration' ) ) {
   );
 }
 $config_menu{'Billing'} = [ \%config_billing, ''    ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit billing events')
+  if $curuser->access_right('Edit billing events')
   || $curuser->access_right('Edit global billing events');
 if ( $curuser->access_right('Configuration') ) {
   $config_menu{'Dialup'}  = [ \%config_dialup, ''    ];
@@ -300,8 +305,7 @@ if ( $curuser->access_right('Configuration') ) {
                             [ \%config_broadband, ''    ];
 }
 $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
 tie my %menu, 'Tie::IxHash',
@@ -322,8 +326,7 @@ $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
 $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
   if keys %tools_menu;
 $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
 use vars qw($gmenunum);