[freeside-commits] branch master updated. 4770b1f7e1abf6ddc8d5b8093fe4d2c48345b386

[Mark Wells]

The branch, master has been updated
       via  4770b1f7e1abf6ddc8d5b8093fe4d2c48345b386 (commit)
      from  a93e9be94c3a385e6b810457c0e06c889e6a6000 (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 4770b1f7e1abf6ddc8d5b8093fe4d2c48345b386
Author: Mark Wells <mark at freeside.biz>
Date:   Sat Jan 31 17:20:56 2015 -0800

    include discount details in Billco spool, #31273, #32959

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:
 FS/FS/cust_bill.pm |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)