diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-02-02 15:04:02 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-02-02 15:04:02 -0600 |
| commit | 973d5dd654ea23dea3ff185e157a404556815ccb (patch) | |
| tree | e11d0917e640fbe626443c57c5de50838f2aa662 /httemplate/view/cust_main | |
| parent | fcb0e3c1cb7567c7ce2c24a367c304b9a1e356f3 (diff) | |
| parent | 80a28e539bd4ad11a309e5f98402beea648fee67 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'httemplate/view/cust_main')
| -rw-r--r-- | httemplate/view/cust_main/payment_history/voided_invoice.html | 10 | ||||
| -rw-r--r-- | 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 f9ff3079a..a64501fc0 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]", 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) { + (<% $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 a8194a75f..63cfb309f 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]", 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) { + (<% $reason %>) +% } +<% mt("on [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> +</I> <% $unvoid %> <%init> |