From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Oct 2015 17:52:23 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=20729c347f88e5380b9309ad3f7dd452970b5c3a;hp=1598480a192e9a056834d636fbd7de7ae00dead6

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

diff --git a/httemplate/view/cust_main/payment_history/invoice.html b/httemplate/view/cust_main/payment_history/invoice.html
index 058da5463..613936e00 100644
--- a/httemplate/view/cust_main/payment_history/invoice.html
+++ b/httemplate/view/cust_main/payment_history/invoice.html
@@ -35,12 +35,12 @@ if ( $cust_bill->closed !~ /^Y/i && $opt{'Void invoices'} ) {
 }
 
 my $email = ($opt{'has_email_address'} && $opt{'Resend invoices'}) ? 
-  q! (<A HREF="javascript:void(0)" ONCLICK="areyousure_popup('Send email receipt for invoice #!.
+  q! (<A HREF="javascript:void(0)" ONCLICK="areyousure_popup('Send email copy of invoice #!.
   $cust_bill->invnum.
   q! to customer?','!.
   "${p}misc/send-invoice.cgi?method=email;notice_name=Invoice;popup=1;invnum=".
   $cust_bill->invnum.
-  q!','Email Invoice Receipt')" TITLE="Send email receipt">email&nbsp;receipt</A>)!
+  q!','Email Invoice Receipt')" TITLE="Send email invoice">email&nbsp;invoice</A>)!
   : '';
 
 my $events = '';