Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined httemplate/view/cust_main/menu.html
index 279373d,ab56bcf..ff001bb
--- 1/httemplate/view/cust_main/menu.html
--- 2/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@@ -493,7 -493,7 +493,7 @@@ my @menu = 
                        uri_escape($cgi->self_url);
                       },
        condition   => sub { $invoicing_list_emailonly },
-       acl         => [ 'View invoices', 'Bulk send customer notices' ],
+       acl         => 'Resend invoices',
      },
    ],
    [
@@@ -557,7 -557,6 +557,7 @@@ foreach my $submenu (@menu) 
        }
        $a .= qq[>$label</A> ];
  
 +      $cgi->param('show', $opt{show});
  
      } elsif ( $entry->{popup} ) {