summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brelsfoard <alex@freeside.biz>2015-01-31 23:22:08 -0500
committerAlex Brelsfoard <alex@freeside.biz>2015-01-31 23:22:08 -0500
commit64514e0541c94b23a096acb265cb47e9ca6e6f85 (patch)
tree89d642dae91dbd47bbca774f70e23940e482b046
parent1ed6875a411a829607836f514b9aa0bb96620181 (diff)
parent4770b1f7e1abf6ddc8d5b8093fe4d2c48345b386 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
-rw-r--r--FS/FS/cust_bill.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d2a6dedf2..888e88bb8 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