From ecc98ec286adeba1290fc6898b39626046ea5eaa Mon Sep 17 00:00:00 2001
From: Alex Brelsfoard <alex@freeside.biz>
Date: Thu, 29 Jan 2015 12:40:14 -0500
Subject: [PATCH] Updating the verbage for voided invoices and payments

---
 httemplate/view/cust_main/payment_history/voided_invoice.html | 10 ++++++++--
 httemplate/view/cust_main/payment_history/voided_payment.html | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html
index ba51b3bca..eb00e057e 100644
--- a/httemplate/view/cust_main/payment_history/voided_invoice.html
+++ b/httemplate/view/cust_main/payment_history/voided_invoice.html
@@ -1,9 +1,15 @@
 <DEL><% $link %><% $invoice %><% $link ? '</A>' : '' %></DEL>
-<I><% mt("voided ([_1]) [_2]", $cust_bill_void->reason, time2str($date_format, $cust_bill_void->void_date) ) |h %> 
+<I>voided 
 % my $void_user = $cust_bill_void->void_access_user;
 % if ($void_user) {
-    by <% $void_user->username %></I>
+    by <% $void_user->username %>
 % }
+% my $reason = $cust_bill_void->reason;
+% if ($reason) {
+     for <% $reason %>
+% }
+<% mt("on [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> 
+</I>
 <% "$unvoid$delete$under" %>
 <%init>
 
diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html
index 207ab9cdd..daeaa31e9 100644
--- a/httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/httemplate/view/cust_main/payment_history/voided_payment.html
@@ -1,9 +1,15 @@
 <DEL><% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %></DEL>
-<I><% mt("voided ([_1]) [_2]", $cust_pay_void->reason, time2str($date_format, $cust_pay_void->void_date) ) |h %> 
+<I>voided 
 % my $void_user = $cust_pay_void->void_access_user;
 % if ($void_user) {
-    by <% $void_user->username %></I>
+    by <% $void_user->username %>
 % }
+% my $reason = $cust_pay_void->reason;
+% if ($reason) {
+     for <% $reason %>
+% }
+<% mt("on [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> 
+</I>
 <% $unvoid %>
 <%init>
 
-- 
2.11.0