RT#34078: Payment History Report / Statement [various fixes, integrated with selfservice]

[freeside.git] / httemplate / view / cust_main / menu.html

diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index ff8937a..90a20ed 100644 (file)
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -197,8 +197,9 @@ my @menu = (
       url         => sub {
                       my $cust_main = shift;
                       my $agentnum = $cust_main->agentnum;
-                      'misc/email-customers.html?table=cust_main;search_hash='.
-                      'agent_virt_agentnum='.$agentnum.";custnum=$custnum";
+                      'misc/email-customers.html?table=cust_main;'.
+                      'agent_virt_agentnum='.$agentnum.";custnum=$custnum;url=".
+                      uri_escape($cgi->self_url);
                      },
       condition   => sub { $invoicing_list_emailonly },
       acl         => 'Bulk send customer notices',
@@ -483,16 +484,16 @@ my @menu = (
       },
     },
     {
-      label       => 'Email payment history to this customer',
+      label       => 'Email statement to this customer',
       url         => sub {
                       my $cust_main = shift;
                       my $agentnum = $cust_main->agentnum;
-                      'misc/email-customers-history.html?table=cust_main;search_hash='.
+                      'misc/email-customer-statement.html?table=cust_main;'.
                       'agent_virt_agentnum='.$agentnum.";custnum=$custnum;url=".
                       uri_escape($cgi->self_url);
                      },
       condition   => sub { $invoicing_list_emailonly },
-      acl         => 'Bulk send customer notices',
+      acl         => [ 'View invoices', 'Bulk send customer notices' ],
     },
   ],
   [