summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorAlex Brelsfoard <alex@freeside.biz>2015-01-29 12:40:14 -0500
committerAlex Brelsfoard <alex@freeside.biz>2015-01-29 12:40:14 -0500
commitecc98ec286adeba1290fc6898b39626046ea5eaa (patch)
treef5230d0bc6a53b1477cd19322531fa47fd58c04c /httemplate
parent42e878b29ae26943d7dc3acfbb7f095a56ae0a2f (diff)
Updating the verbage for voided invoices and payments
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/view/cust_main/payment_history/voided_invoice.html10
-rw-r--r--httemplate/view/cust_main/payment_history/voided_payment.html10
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>