[freeside-commits] branch FREESIDE_3_BRANCH updated. e9d371c33b5f53fd078c5f5a7d93e5c36743c8bc

[Alex Brelsfoard]

The branch, FREESIDE_3_BRANCH has been updated
       via  e9d371c33b5f53fd078c5f5a7d93e5c36743c8bc (commit)
      from  c09066ef7930f5190cc91f42ab66b33c2d15f643 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e9d371c33b5f53fd078c5f5a7d93e5c36743c8bc
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Sat Jan 31 23:29:13 2015 -0500

    RT #25498 adding reason to voided payments and voided invoices on payment history

diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html
index f9ff307..a64501f 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 a8194a7..63cfb30 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>
 

4770b1f7e1abf6ddc8d5b8093fe4d2c48345b386
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d2a6ded..888e88b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1902,13 +1902,18 @@ sub print_csv {
     my $lineseq = 0;
     foreach my $item ( $self->_items_pkg ) {
 
+      my $description = $item->{'description'};
+      if ( $item->{'_is_discount'} and exists($item->{ext_description}[0]) ) {
+        $description .= ': ' . $item->{ext_description}[0];
+      }
+
       $csv->combine(
         '',                     #  1 | N/A-Leave Empty            CHAR   2
         '',                     #  2 | N/A-Leave Empty            CHAR  15
         $tracctnum,             #  3 | Account Number             CHAR  15
         $self->invnum,          #  4 | Invoice Number             CHAR  15
         $lineseq++,             #  5 | Line Sequence (sort order) NUM    6
-        $item->{'description'}, #  6 | Transaction Detail         CHAR 100
+        $description,           #  6 | Transaction Detail         CHAR 100
         $item->{'amount'},      #  7 | Amount                     NUM*   9
         '',                     #  8 | Line Format Control**      CHAR   2
         '',                     #  9 | Grouping Code              CHAR   2

-----------------------------------------------------------------------

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