X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fmenu.html;h=c4422a0176ae0c9195b8c9341c75fee9cc280f09;hb=ce6cc16ab448ec7bf2fe2d493985bcbd324eabaf;hp=5789a8a3f8438762907e06cc2c4f53aa1b701ee1;hpb=b236545e63f3653203baba2785506dbafe88a22a;p=freeside.git

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 5789a8a3f..c4422a017 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -12,10 +12,28 @@
 
 % }
 
-<link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+% unless ( $opt{'nocss'} ) {
+  <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+% }
+<link href="<%$fsurl%>elements/freeside-menu.css" type="text/css" rel="stylesheet">
 
 <SCRIPT TYPE="text/javascript">
 
+% my $fs_popup = include( '/elements/popup_link_onclick.html',
+%                           'action'      => $fsurl.'docs/about.html',
+%                           'label'       => 'Freeside',
+%                           'style'       => 'color:#999999',
+%                           'actionlabel' => 'About',
+%                           'width'       => 300,
+%                           'height'      => 360,
+%                           'color'       => '#7e0079',
+%                           'scrolling'   => 'no',
+%                       );
+% $fs_popup =~ s/return false;//;
+  function about_freeside() {
+    <% $fs_popup |n %>
+  }
+
   webfxMenuImagePath      = "<%$fsurl%>images/";
   webfxMenuUseHover       = 1;
   webfxMenuShowTime       = 300;
@@ -33,8 +51,8 @@
 %
 %         my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
 
-          <% $subhtml %>
-          myBar.add(new WebFXMenuButton("<% $item %>", null, "<% $tooltip %>", <% $submenuname %> ));
+          <% $subhtml |n %>
+          myBar.add(new WebFXMenuButton("<% $item %>", null, "<% $tooltip %>", <% $submenuname |n %> ));
 
 %     } else { 
     
@@ -56,7 +74,12 @@ my $fsurl = $opt{'freeside_baseurl'};
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
-#Active tickets not assigned to a customer
+#XXX Active tickets not assigned to a customer
+
+tie my %report_prospects, 'Tie::IxHash',
+  'List prospects' => [ $fsurl. 'search/prospect_main.html', '' ],
+  'Advanced prospect reports' => [ $fsurl. 'search/report_prospect_main.html', '' ],
+;
 
 tie my %report_customers_lists, 'Tie::IxHash',
   'by customer number' => [ $fsurl. 'search/cust_main.cgi?browse=custnum', '' ],
@@ -95,11 +118,24 @@ tie my %report_invoices, 'Tie::IxHash',
   'Advanced invoice reports' => [ $fsurl.'search/report_cust_bill.html', 'by agent, date range, etc.' ],
 ;
 
+tie my %report_discounts, 'Tie::IxHash',
+  'Discount graph'  => [ $fsurl. 'graph/report_cust_bill_pkg_discount.html', 'Discount overview per month' ],
+  'Discount detail' => [ $fsurl.'search/report_cust_bill_pkg_discount.html', 'Discount report (by employee and/or date range)' ],
+  #awful name
+  'Package discounts' => [ $fsurl.'search/report_cust_pkg_discount.html', 'Active/inactive discounts by package' ],
+;
+
 tie my %report_services, 'Tie::IxHash';
 if ( $curuser->access_right('Configuration') ) {
   $report_services{'Service definitions'} =  [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ];
   $report_services{'separator'} =  '';
 }
+
+if ( $curuser->access_right('List services') ) {
+  $report_services{'Unprovisioned services'} =  [ $fsurl.'search/report_unprovisioned_services.html', 'Unprovisioned services' ];
+  $report_services{'separator2'} =  '';
+}
+
 foreach my $svcdb ( FS::part_svc->svc_tables() ) {
 
   my $name =        "FS::$svcdb"->table_info->{'name_plural'}
@@ -133,10 +169,19 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
   }
 
   if ( $svcdb eq 'svc_acct' ) {
+
     $report_svc{"All $lcname never logged in"} = 
       [ svc_url( %svc_url, 'query' => "magic=nologin;sortby=svcnum" ),
         '',
       ];
+
+  } elsif ( $svcdb eq 'svc_phone' ) {
+
+    $report_svc{"${name}' total usage by time period"} = 
+      [ $fsurl. 'search/report_svc_phone.html',
+        'Total usage (minutes, and amount billed) for the specified time period, per phone number.',
+      ];
+
   }
 
   if ( $curuser->access_right('View/link unlinked services') ) {
@@ -146,11 +191,16 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
       ];
   }
 
-  if ( $svcdb eq 'svc_acct' ) {
+  if ( $svcdb eq 'svc_acct' || $svcdb eq 'svc_broadband' ) {
     $report_svc{"Advanced $lcsname reports"} = 
       [ $fsurl."search/report_$svcdb.html", '' ];
   }
 
+  if ( $svcdb eq 'svc_phone' ) {
+    $report_svc{"Phone number (DID) availability"} =
+      [ $fsurl."search/report_phone_avail.html", '' ];
+  }
+
   $report_services{$name} = [ \%report_svc, $longname ];
 
 }
@@ -168,56 +218,112 @@ if ( $curuser->access_right('Financial reports') ) {
   $report_packages{'separator2'} =  '';
 }
 $report_packages{'All customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
+$report_packages{'Package summary'} = [ $fsurl.'search/cust_pkg_summary.html', 'Show package sales summary', ];
 $report_packages{'Suspended customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
+$report_packages{'Suspension summary'} = [ $fsurl.'search/cust_pkg_susp.html', 'Show suspension activity', ];
 $report_packages{'Customer packages with unconfigured services'} =  [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
+$report_packages{'FCC Form 477 packages'} =  [ $fsurl.'search/report_477.html', 'Summarize packages by census tract for particular types' ]
+  if $conf->exists('cust_main-require_censustract');
 $report_packages{'Advanced package reports'} =  [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
 
+tie my %report_inventory, 'Tie::IxHash',
+  'Inventory by agent' => [ $fsurl.'search/report_agent_inventory.html', '' ],
+  'Inventory activity' => [ $fsurl.'search/report_h_inventory_item.html', '' ],
+;
+
 tie my %report_rating, 'Tie::IxHash',
   'RADIUS sessions' => [ $fsurl.'search/sqlradius.html', '' ],
   'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ],
   'Time worked' => [ $fsurl.'search/report_rt_transaction.html', '' ],
+  'Time worked summary' => [ $fsurl.'search/report_rt_ticket.html', '' ],
+;
+
+tie my %report_ticketing_statistics, 'Tie::IxHash',
+  'Tickets per day per Queue'         => [ $fsurl.'rt/RTx/Statistics/CallsQueueDay', 'View the number of tickets created, resolved or deleted in a specific Queue, over the requested period of days' ],
+  'Ticket status by Queue'            => [ $fsurl.'rt/RTx/Statistics/OpenStalled', 'View numbers of new, open and stalled tickets in a selected Queue' ],
+  'Tickets per day (multiple Queues)' => [ $fsurl.'rt/RTx/Statistics/CallsMultiQueue', 'View tickets created, resolved or deleted on in one or more Queues over a specified time period' ],
+  'Tickets per Day of Week'           => [ $fsurl.'rt/RTx/Statistics/DayOfWeek', 'View trends showing when tickets are created, resolved or deleted' ],
+  'Time to resolve'                   => [ $fsurl.'rt/RTx/Statistics/Resolution', 'View how long tickets take to be resolved by Queue' ],
+  'Time to resolve (scatter graph)'   => [ $fsurl.'rt/RTx/Statistics/TimeToResolve', 'View a detailed scatter graph of time to resolve tickets by Queue' ],
+;
+
+tie my %report_ticketing, 'Tie::IxHash',
+  'Resolved by owner'       => [ $fsurl.'rt/Tools/Reports/ResolvedByOwner.html', '' ],
+  'Resolved in date range'  => [ $fsurl.'rt/Tools/Reports/ResolvedByDates.html', '' ],
+  'Created in date range'   => [ $fsurl.'rt/Tools/Reports/CreatedByDates.html', '' ],
+  'separator'               => '',
+  'Statistics'              => [ \%report_ticketing_statistics, '' ],
+  'separator2'              => '',
+  'Advanced ticket reports' => [ $fsurl.'rt/Search/Build.html', 'List tickets by any criteria' ],
 ;
 
 tie my %report_bill_event, 'Tie::IxHash',
   'All billing events' => [ $fsurl.'search/report_cust_event.html', 'All billing events for a date range' ],
   'Billing event errors' => [ $fsurl.'search/report_cust_event.html?failed=1', 'Failed credit cards, processor or printer problems, etc.' ],
-  'All invoice events' => [ $fsurl.'search/cust_bill_event.html', 'Reports on deprecated, old-style invoice events for a date range' ],
-  'Invoice event errors' => [ $fsurl.'search/cust_bill_event.html?failed=1', 'Reports on deprecated, old-style events for failed credit cards, processor or printer problems, etc.' ],
+#  'All invoice events' => [ $fsurl.'search/cust_bill_event.html', 'Reports on deprecated, old-style invoice events for a date range' ],
+#  'Invoice event errors' => [ $fsurl.'search/cust_bill_event.html?failed=1', 'Reports on deprecated, old-style events for failed credit cards, processor or printer problems, etc.' ],
 ;
 
+tie my %report_payments, 'Tie::IxHash',
+    'Payments' => [ $fsurl.'search/report_cust_pay.html', 'Payment report (by type and/or date range)' ],
+;
+$report_payments{'Pending Payments'} = [ $fsurl.'search/cust_pay_pending.html?magic=_date;statusNOT=done', 'Pending real-time payments' ]
+  if $curuser->access_right('View customer pending payments');
+$report_payments{'Voided Payments'} = [ $fsurl.'search/report_cust_pay.html?void=1', 'Voided payment report (by type and/or date range)' ]
+  if $curuser->access_right('View customer pending payments');
+$report_payments{'Unapplied Payments'} = [ $fsurl.'search/report_cust_pay.html?unapplied=1', 'Unapplied payment report (by type and/or date range)' ];
+$report_payments{'Payment Batches'} = [ $fsurl.'search/pay_batch.html', 'Payment batches (by status and/or date range)' ]
+  if $conf->exists('batch-enable') || $conf->config('batch-enable_payby');
+$report_payments{'Unapplied Payment Aging'} = [ $fsurl.'search/report_unapplied_cust_pay.html', 'Unapplied payment aging report' ];
+
 tie my %report_financial, 'Tie::IxHash';
 if($curuser->access_right('Financial reports')) {
+
   %report_financial = (
     'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
     'Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg.html', 'Sales report and graph (by agent, package class and/or date range)' ],
+    'Rated Call Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg_detail.html', 'Sales report and graph (by agent, package class, usage class and/or date range)' ],
+    'Employee Commission Report' => [ $fsurl.'search/report_employee_commission.html', '' ],
     'Credit Report' => [ $fsurl.'search/report_cust_credit.html', 'Credit report (by employee and/or date range)' ],
-    'Payment Report' => [ $fsurl.'search/report_cust_pay.html', 'Payment report (by type and/or date range)' ],
+    'Unapplied Credits' => [ $fsurl.'search/report_cust_credit.html?unapplied=1', 'Unapplied credit report (by type and/or date range)' ],
+    'Refund Report' => [ $fsurl.'search/report_cust_refund.html', 'Refund report (by type and/or date range)' ],
+    'Unapplied Refunds' => [ $fsurl.'search/report_cust_refund.html?unapplied=1', 'Unapplied refund report (by type and/or date range)' ],
+    'Package Costs Report' => [ $fsurl.'graph/report_cust_pkg_cost.html', 'Package setup and recurring costs graph' ],
   );
-  $report_financial{'Pending Payment Report'} = [ $fsurl.'search/cust_pay_pending.html?magic=_date;statusNOT=done', 'Pending real-time payments' ]
-    if $curuser->access_right('View customer pending payments');
-  $report_financial{'Payment Batch Report'} = [ $fsurl.'search/pay_batch.html', 'Payment batches (by status and/or date range)' ]
-    if $conf->exists('batch-enable') || $conf->config('batch-enable_payby');
-  $report_financial{'Prepaid Income'} = [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue)  report' ];
   $report_financial{'A/R Aging'} = [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ];
-  $report_financial{'Sales Tax Liability'} = [ $fsurl.'search/report_tax.html', 'Sales tax liability report (old taxclass system)' ];
-  $report_financial{'Tax Liability'} = [ $fsurl.'search/report_newtax.html', 'Tax liability report (new tax products system)' ]
+  $report_financial{'Prepaid Income'} = [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue)  report' ];
+  $report_financial{'Sales Tax Liability'} = [ $fsurl.'search/report_tax.html', 'Sales tax liability report (internal taxclass system)' ];
+  $report_financial{'Tax Liability'} = [ $fsurl.'search/report_newtax.html', 'Tax liability report (vendor data tax products system)' ]
     if $conf->exists('enable_taxproducts');
-}
-elsif($curuser->access_right('Receivables report')) {
+
+} elsif($curuser->access_right('Receivables report')) {
+
   $report_financial{'A/R Aging'} = [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ];
+
 } # else $report_financial contains nothing.
 
 tie my %report_menu, 'Tie::IxHash';
+$report_menu{'Prospects'}   = [ \%report_prospects, 'Prospect reports' ]
+  if $curuser->access_right('List prospects');
 $report_menu{'Customers'}   = [ \%report_customers, 'Customer reports'  ]
   if $curuser->access_right('List customers');
 $report_menu{'Invoices'}    =  [ \%report_invoices,  'Invoice reports'   ]
   if $curuser->access_right('List invoices');
+$report_menu{'Discounts'}   =  [ \%report_discounts, 'Discount reports'  ]
+  if $curuser->access_right('Financial reports');
+$report_menu{'Payments'}    =  [ \%report_payments,  'Payment reports'   ]
+  if $curuser->access_right('Financial reports');
 $report_menu{'Packages'}    =  [ \%report_packages,  'Package reports'   ]
   if $curuser->access_right('List packages');
 $report_menu{'Services'}    =  [ \%report_services,  'Services reports'  ]
   if $curuser->access_right('List services');
+$report_menu{'Inventory'}    =  [ \%report_inventory,  'Inventory reports'  ]
+  if $curuser->access_right('Configuration'); #XXX List inventory?
 $report_menu{'Usage'} =  [ \%report_rating,    'Usage reports'  ]
   if $curuser->access_right('List rating data');
+$report_menu{'Tickets'}   = [ \%report_ticketing, 'Ticket reports' ]
+  if $conf->config('ticket_system')
+  ;#&& FS::TicketSystem->access_right(\%session, 'Something');
 $report_menu{'Billing events'} =  [ \%report_bill_event, 'Billing events' ]
   if $curuser->access_right('Billing event reports');
 $report_menu{'Financial'}  = [ \%report_financial, 'Financial reports' ]
@@ -227,20 +333,21 @@ $report_menu{'SQL Query'}  = [ $fsurl.'search/report_sql.html', 'SQL Query' ]
   if $curuser->access_right('Raw SQL');
 
 tie my %tools_importing, 'Tie::IxHash',
-  'Import customers' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
-  'Import customer comments from CSV file' => [ $fsurl.'misc/cust_main_note-import.html', '' ],
-  'Import one-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
-  'Import payments from CSV file' => [ $fsurl.'misc/cust_pay-import.cgi', '' ],
-  'Import phone numbers (DIDs)' => [ $fsurl.'misc/phone_avail-import.html', '' ],
-  'Import Call Detail Records (CDRs) from CSV file' => [ $fsurl.'misc/cdr-import.html', '' ],
+  'Customers' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
+  'Customer packages' => [ $fsurl.'misc/cust_pkg-import.html', '' ],
+  'Customer comments from CSV file' => [ $fsurl.'misc/cust_main_note-import.html', '' ],
+  'One-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
+  'Payments from CSV file' => [ $fsurl.'misc/cust_pay-import.cgi', '' ],
+  'Phone numbers (DIDs)' => [ $fsurl.'misc/phone_avail-import.html', '' ],
+  'Call Detail Records (CDRs)' => [ $fsurl.'misc/cdr-import.html', '' ],
 #  'Import call rates and regions' => [ $fsurl.'misc/rate-import.html', '' ],
 ;
 if ( $conf->exists('enable_taxproducts') ) {
   if ( $conf->exists('taxdatadirectdownload') ) {
-    $tools_importing{'Import tax rates from vendor site'} =
+      $tools_importing{'Tax rates from vendor site'} =
       [ $fsurl.'misc/tax-fetch_and_import.cgi', '' ];
   } else {
-    $tools_importing{'Import tax rates from CSV files'} =
+    $tools_importing{'Tax rates from CSV files'} =
       [ $fsurl.'misc/tax-import.cgi', '' ];
   }
 }
@@ -254,90 +361,158 @@ tie my %tools_exporting, 'Tie::IxHash',
 #      <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
 #    <BR> -->
 
+tie my %tools_ticketing, 'Tie::IxHash',
+  'Offline'      => [ $fsurl.'rt/Tools/Offline.html', '' ],
+  'My Day'       => [ $fsurl.'rt/Tools/MyDay.html', '' ],
+  'My Approvals' => [ $fsurl.'rt/Approvals/', '' ],
+;
+$tools_ticketing{'Cron Tool'} = [ $fsurl.'rt/Developer/CronTool/', '' ]
+  if $conf->exists('rt-crontool');
+
 tie my %tools_menu, 'Tie::IxHash', ();
 $tools_menu{'Quick payment entry'} =  [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ]
   if $curuser->access_right('Post payment batch');
 $tools_menu{'Process payment batches'} = [ $fsurl.'search/pay_batch.cgi?magic=_date;open=1;intransit=1', 'Process credit card and electronic check batches' ]
   if ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
      && $curuser->access_right('Process batches');
+$tools_menu{'Process invoice batches'} = [ $fsurl.'search/bill_batch.cgi' ] 
+  if $conf->exists('invoice_print_pdf');
 $tools_menu{'Job Queue'} =  [ $fsurl.'search/queue.html', 'View pending job queue' ]
   if $curuser->access_right('Job queue');
-$tools_menu{'Time Queue'} =  [ $fsurl.'search/timeworked.html', 'View pending support time' ]
+$tools_menu{'Ticketing'} = [ \%tools_ticketing, 'Ticketing tools' ]
+  if $conf->config('ticket_system');
+$tools_menu{'Business card scan'} = [ $fsurl.'edit/prospect_main-upload.html' ]
+  if $curuser->access_right('New prospect');
+$tools_menu{'Time Queue'} =  [ $fsurl.'search/report_timeworked.html', 'View pending support time' ]
   if $curuser->access_right('Time queue');
+$tools_menu{'Attachments'} = [ $fsurl.'browse/cust_attachment.html', 'View customer attachments' ]
+  if !$conf->config('disable_cust_attachment') and $curuser->access_right('View attachments') and $curuser->access_right('Browse attachments');
 $tools_menu{'Importing'} =  [ \%tools_importing, 'Import tools' ]
   if $curuser->access_right('Import');
 $tools_menu{'Exporting'} =  [ \%tools_exporting, 'Export tools' ]
   if $curuser->access_right('Export');
 
 tie my %config_employees, 'Tie::IxHash',
-  'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
-  'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
+  'Employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
+  'Employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
 ;
 
-tie my %config_export_svc_pkg, 'Tie::IxHash', ();
+tie my %config_export_svc, 'Tie::IxHash', ();
 if ( $curuser->access_right('Configuration') ) {
-  $config_export_svc_pkg{'View/Edit exports'} = [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ];
-  $config_export_svc_pkg{'View/Edit service definitions'} = [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ];
+  $config_export_svc{'Exports'} = [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ];
+  $config_export_svc{'Service definitions'} = [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ];
 }
-$config_export_svc_pkg{'View/Edit package definitions'} = [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ]
+
+tie my %config_pkg_reason, 'Tie::IxHash',
+  'Cancel reasons' => [ $fsurl.'browse/reason.html?class=C', 'Cancel reasons explain why a service was cancelled.' ],
+  'Cancel reason types' => [ $fsurl.'browse/reason_type.html?class=C', 'Cancel reason types define groups of reasons.' ],
+  'Suspend reasons' => [ $fsurl.'browse/reason.html?class=S', 'Suspend reasons explain why a service was suspended.' ],
+  'Suspend reason types' => [ $fsurl.'browse/reason_type.html?class=S', 'Suspend reason types define groups of reasons.' ],
+;
+
+tie my %config_pkg, 'Tie::IxHash', ();
+$config_pkg{'Package definitions'} = [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ]
   if    $curuser->access_right('Edit package definitions')
      || $curuser->access_right('Edit global package definitions');
 if ( $curuser->access_right('Configuration') ) {
-  $config_export_svc_pkg{'View/Edit package categories'} =  [ $fsurl.'browse/pkg_category.html', 'Package categories define groups of package classes, for reporting and convenience purposes.' ];
-  $config_export_svc_pkg{'View/Edit package classes'} =  [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ];
-  $config_export_svc_pkg{'View/Edit cancel reason types'} = [ $fsurl.'browse/reason_type.html?class=C', 'Cancel reason types define groups of reasons, for reporting and convenience purposes.' ];
-  $config_export_svc_pkg{'View/Edit cancel reasons'} = [ $fsurl.'browse/reason.html?class=C', 'Cancel reasons explain why a service was cancelled.' ];
-  $config_export_svc_pkg{'View/Edit suspend reason types'} = [ $fsurl.'browse/reason_type.html?class=S', 'Suspend reason types define groups of reasons, for reporting and convenience purposes.' ];
-  $config_export_svc_pkg{'View/Edit suspend reasons'} = [ $fsurl.'browse/reason.html?class=S', 'Suspend reasons explain why a service was suspended.' ];
+
+  #package grouping sub-menu?
+  $config_pkg{'Package classes'} =  [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for taxation, ordering convenience and reporting.' ];
+  $config_pkg{'Package categories'} =  [ $fsurl.'browse/pkg_category.html', 'Package categories define groups of package classes, for invoice sections.' ];
+  $config_pkg{'Package report classes'} =  [ $fsurl.'browse/part_pkg_report_option.html', 'Package classes define optional groups of packages for reporting only.' ];
+  #eo package grouping sub-menu
+
+  $config_pkg{'Discounts'} = [ $fsurl.'browse/discount.html', '' ];
+  $config_pkg{'Cancel/Suspend Reasons'} = [ \%config_pkg_reason, '' ];
 }
 
+tie my %config_cust, 'Tie::IxHash',
+  'Customer classes'    =>  [ $fsurl.'browse/cust_class.html', 'Customer classes define groups of customers for reporting.' ],
+  'Customer categories' =>  [ $fsurl.'browse/cust_category.html', 'Customer categories define groups of customer classes.' ],
+;
+  
+$config_cust{'Customer note classes'} = [ $fsurl.'browse/cust_note_class.html', 'Customer note classes define groups of notes for reporting.' ]
+    if ($conf->exists('note-classes') && $conf->config('note-classes') > 0);
+
 tie my %config_agent, 'Tie::IxHash',
-  'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
-  'View/Edit agents'      => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
-  'View/Edit agent payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors for agent overrides' ];
+  'Agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
+  'Agents'      => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
+  'Agent payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors for agent overrides' ];
 ;
 
 tie my %config_billing_rates, 'Tie::IxHash',
-  'View/Edit rate plans' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans' ],
-  'View/Edit regions and prefixes' => [ $fsurl.'browse/rate_region.html', 'Manage regions and prefixes' ],
-  'View/Edit usage classes'  => [ $fsurl.'browse/usage_class.html', 'Usage classes define groups of usage for taxation purposes.' ],
-  'Edit rates with Excel' => [ $fsurl.'misc/rate_edit_excel.html', 'Download and edit rates with Excel, then upload changes.' ],
+  'Rate plans' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans' ],
+  'Regions and prefixes' => [ $fsurl.'browse/rate_region.html', 'Manage regions and prefixes' ],
+  'Usage classes'  => [ $fsurl.'browse/usage_class.html', 'Usage classes define groups of usage for taxation.' ],
+  'Time periods' => [ $fsurl.'browse/rate_time.html', 'Time periods define days and hours for rate plans' ],
+  'Edit rates with Excel' => [ $fsurl.'misc/rate_edit_excel.html', 'Download and edit rates with Excel, then upload changes.' ], #"Edit with Excel" ?
 ;
 
 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' ]
+#  'Payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ];
+$config_billing{'Billing events'} = [ $fsurl.'browse/part_event.html', 'Billing actions for customers, invoices and packages' ]
     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' ];
-  $config_billing{'View/Edit invoice templates'}      = [ $fsurl.'browse/invoice_template.html', 'Edit templates for HTML, plaintext and typeset invoices' ];
-  $config_billing{'View/Edit prepaid cards'}          = [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ];
-  $config_billing{'View/Edit call rates and regions'} = [ \%config_billing_rates, 'Manage rate plans, regions and prefixes for VoIP and call billing' ];
-  $config_billing{'View/Edit locales and tax rates (old tax class system)'}  = [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ];
-  $config_billing{'View/Edit tax rates (new tax products system)'}  = [ $fsurl.'browse/tax_rate.cgi', 'Edit tax rates for the new tax products system' ];
-  $config_billing{'View/Edit credit reason types'}  = [ $fsurl.'browse/reason_type.html?class=R', 'Credit reason types define groups of reasons, for reporting and convenience purposes.' ];
-  $config_billing{'View/Edit credit reasons'}  = [ $fsurl.'browse/reason.html?class=R', 'Credit reasons explain why a credit was issued.' ];
+  #$config_billing{'Invoice events'}         = [ $fsurl.'browse/part_bill_event.cgi', 'Deprecated, old-style actions for overdue invoices' ];
+  $config_billing{'Invoice templates'}      = [ $fsurl.'browse/invoice_template.html', 'Edit templates for HTML, plaintext and typeset invoices' ];
+  $config_billing{'Prepaid cards'}          = [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ];
+  $config_billing{'Call rates and regions'} = [ \%config_billing_rates, 'Manage rate plans, regions and prefixes for VoIP and call billing' ];
+
+  my $config_taxes_name = 'Locales and tax rates'.
+                          ( $conf->exists('enable_taxproducts')
+                            ? ' (internal tax class system)'
+                            : ''
+                          );
+  $config_billing{$config_taxes_name}  = [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ];
+  $config_billing{'Tax rates (vendor data tax products system)'}  = [ $fsurl.'browse/tax_rate.cgi', 'Edit tax rates for the vendor data tax products system' ]
+     if $conf->exists('enable_taxproducts');
+  $config_billing{'Tax classes'} = [ $fsurl. 'browse/part_pkg_taxclass.html', 'Tax classes' ];
+
+  $config_billing{'Credit reasons'}  = [ $fsurl.'browse/reason.html?class=R', 'Credit reasons explain why a credit was issued.' ];
+  $config_billing{'Credit reason types'}  = [ $fsurl.'browse/reason_type.html?class=R', 'Credit reason types define groups of reasons.' ];
 }
 
+tie my %config_ticketing, 'Tie::IxHash',
+  'Ticketing Users'      => [ $fsurl.'rt/Admin/Users', 'View/Edit ticketing users' ], #XXX to be unified
+  'Ticketing Groups'     => [ $fsurl.'rt/Admin/Groups', 'View/Edit ticketing groups and group membership' ], #XXX to be unified
+  'Ticketing Queues'     => [ $fsurl.'rt/Admin/Queues', 'View/Edit ticketing queues and queue-specific properties' ], 
+  'Ticket Custom Fields' => [ $fsurl.'rt/Admin/CustomFields', 'View/Edit ticketing custom fields' ], 
+  'Ticketing Global'     => [ $fsurl.'rt/Admin/Global', 'View/Edit ticketing configuration applicable to all queues' ], 
+  #"System Configuraiton"?  useless, just makes people report errors about missing Module::Versions::Report #'Ticketing Tools'     => [ $fsurl.'rt/Admin/Tools', '' ], 
+;
+
 tie my %config_dialup, 'Tie::IxHash',
-  'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
+  'Access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
 ;
 
 tie my %config_broadband, 'Tie::IxHash',
-  'View/Edit routers'        => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
-  'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
+  'Routers'        => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
+  'Address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
+;
+
+tie my %config_phone, 'Tie::IxHash',
+  'View/Edit phone device types' => [ $fsurl.'browse/part_device.html', 'Phone device types' ],
 ;
 
 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' ]
+$config_misc{'Message templates'} = [ $fsurl.'browse/msg_template.html', 'Templates for customer notices' ]
+  if $curuser->access_right('Edit templates')
+  || $curuser->access_right('Edit global templates')
+  || $curuser->access_right('Configuration');
+$config_misc{'Tags'} = [ $fsurl.'browse/part_tag.html', '' ]
+  if $curuser->access_right('Configuration');
+$config_misc{'Advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.' ]
   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', ];
-  $config_misc{'View/Edit message catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ];
-  $config_misc{'View/Edit inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ];
+  $config_misc{'Virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
+  $config_misc{'Error catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ];
 }
+$config_misc{'Inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ]
+  if $curuser->access_right('Edit inventory')
+  || $curuser->access_right('Edit global inventory')
+  || $curuser->access_right('Configuration');
 
 tie my %config_menu, 'Tie::IxHash';
 if ( $curuser->access_right('Configuration' ) ) {
@@ -347,27 +522,70 @@ if ( $curuser->access_right('Configuration' ) ) {
     'Employees'     => [ \%config_employees, '' ],
   );
 }
-$config_menu{'Provisioning, services and packages'} =
-    [ \%config_export_svc_pkg, ''    ]
+$config_menu{'Provisioning and services'} = [ \%config_export_svc, '' ]
+  if $curuser->access_right('Configuration' );
+$config_menu{'Packages'} = [ \%config_pkg, '' ]
   if    $curuser->access_right('Configuration' )
      || $curuser->access_right('Edit package definitions')
      || $curuser->access_right('Edit global package definitions');
-$config_menu{'Resellers'} = [ \%config_agent, ''    ]
+$config_menu{'Customers'} = [ \%config_cust, '' ]
   if $curuser->access_right('Configuration');
-$config_menu{'Billing'} = [ \%config_billing, ''    ]
+$config_menu{'Resellers'} = [ \%config_agent, '' ]
+  if $curuser->access_right('Configuration');
+$config_menu{'Billing'} = [ \%config_billing, '' ]
   if $curuser->access_right('Edit billing events')
   || $curuser->access_right('Edit global billing events');
+$config_menu{'Ticketing'} = [ \%config_ticketing, '' ]
+  if $conf->config('ticket_system')
+  && FS::TicketSystem->access_right(\%session, 'ShowConfigTab');
 $config_menu{'Dialup'}  = [ \%config_dialup, ''    ]
   if ( $curuser->access_right('Dialup configuration') );
-$config_menu{'Fixed (username-less) broadband'} = [ \%config_broadband, ''    ]
+$config_menu{'Broadband'} = [ \%config_broadband, ''    ]
   if ( $curuser->access_right('Broadband configuration') );
+$config_menu{'Phone'}  = [ \%config_phone, ''    ]
+  if ( $curuser->access_right('Configuration') );
 $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
-  if $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Configuration' )
+  || $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
-tie my %menu, 'Tie::IxHash',
-  'Billing Main'   => [ $fsurl, 'Billing start page', ],
-;
+
+my $wiki = 'http://www.freeside.biz/mediawiki/index.php';
+my $doc_link = $conf->config('support-key')
+                 ? "$wiki/Supported:Documentation"
+                 : $curuser->access_right('Configuration')
+                   ? "$wiki/Freeside:2.1:Documentation"
+                   : "$wiki/Freeside:2.1:Documentation:User";
+
+eval "use RT;"
+  if $conf->config('ticket_system') eq 'RT_Internal';
+
+tie my %help_menu, 'Tie::IxHash', 'Billing documentation' => [ $doc_link, 'Freeside documentation' ];
+$help_menu{'Ticketing documentation'} = [ 'http://wiki.bestpractical.com/', 'Request Tracker Wiki' ]
+  if $conf->config('ticket_system') eq 'RT_Internal';
+$help_menu{'Networking monitoring documentation'} = [ 'http://torrus.org/userguide.pod.html', 'Torrus User Guide' ]
+  if $conf->config('network_monitoring_system') eq 'Torrus_Internal';
+$help_menu{'separator'} = '';
+$help_menu{"About Freeside v$FS::VERSION"} = [ "javascript:about_freeside()", '' ];
+$help_menu{"About RT v$RT::VERSION"} = [ 'http://www.bestpractical.com/rt', 'Request Tracker Homepage' ]
+  if $conf->config('ticket_system') eq 'RT_Internal';
+$help_menu{"About Torrus v1.0.9"} = [ 'http://www.torrus.org/', 'Torrus Homepage' ] #XXX manual version
+  if $conf->config('network_monitoring_system') eq 'Torrus_Internal';
+
+
+tie my %menu, 'Tie::IxHash';
+
+if ( $conf->config('menu-prepend_links')) {
+  my @links = split(/\n/, $conf->config('menu-prepend_links'));
+  foreach my $link (@links) {
+    $link =~ /^\s*(\S+)\s+(.*?)(\s*\(([^\)]*)\))?$/ or next;
+    my($url, $label, $alt) = ($1, $2, $4);
+    $menu{$label} = [ $url, $alt ];
+  }
+}
+
+$menu{'Billing Main'} = [ $fsurl, 'Billing start page', ];
+
 if ( $conf->config('ticket_system') ) {
   $menu{'Ticketing Main'} =
     [ 
@@ -378,6 +596,16 @@ if ( $conf->config('ticket_system') ) {
       'Ticketing start page',
     ],
 }
+
+if ( $conf->config('network_monitoring_system') eq 'Torrus_Internal' ) {
+  $menu{'Network Main'} =
+    [ $fsurl.'torrus/main', 'Network monitoring start page' ],
+}
+
+$menu{'New prospect'} = [ $fsurl.'edit/prospect_main.html', 'Add a new prospect' ]
+  if $curuser->access_right('New prospect');
+$menu{'New customer'} = [ $fsurl.'edit/cust_main.cgi', 'Add a new customer' ]
+  if $curuser->access_right('New customer');
 $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
   if keys %report_menu;
 $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
@@ -390,8 +618,11 @@ $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
   || $curuser->access_right('Edit global billing events')
   || $curuser->access_right('Dialup configuration')
   || $curuser->access_right('Broadband configuration')
+  || $curuser->access_right('Phone configuration')
   || $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
+$menu{'Help'} = [ \%help_menu, '' ];
+
 
 use vars qw($gmenunum);
 $gmenunum = 0;
@@ -404,7 +635,8 @@ sub submenu {
 
   "var myMenu$menunum = new WebFXMenu;\n".
   #"myMenu$menunum.useAutoPosition = true;\n".
-  "myMenu$menunum.emptyText = '$title';\n".
+#  "myMenu$menunum.emptyText = '$title';\n".
+  "myMenu$menunum.emptyText = '';\n".
 
   (
     join("\n", map {
@@ -433,7 +665,7 @@ sub submenu {
 
     } keys %$submenu )
   ). "\n".
-  "myMenu$menunum.width = 280;\n",
+  "myMenu$menunum.width = 256;\n",
 
   "myMenu$menunum";