diff options
| author | Mark Wells <mark@freeside.biz> | 2015-02-03 11:43:51 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-02-03 11:43:51 -0800 |
| commit | a3f6785d22a743f03a805f537083ab57a20d5c6f (patch) | |
| tree | 68624a2662d244d268616ff0594f47029af89c2e /FS/FS/cust_bill.pm | |
| parent | 9a14161203e3fb6f4733d3554d66dcdc1486fe23 (diff) | |
make non-package fees appear in invoice spools, #29824, #25899
Diffstat (limited to 'FS/FS/cust_bill.pm')
| -rw-r--r-- | FS/FS/cust_bill.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index b7d8b6e2d..f57f14f09 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1907,7 +1907,14 @@ sub print_csv { if ( lc($opt{'format'}) eq 'billco' ) { my $lineseq = 0; - foreach my $item ( $self->_items_pkg ) { + my %items_opt = ( format => 'template', + escape_function => sub { shift } ); + # I don't know what characters billco actually tolerates in spool entries. + # Text::CSV will take care of delimiters, though. + + my @items = ( $self->_items_pkg(%items_opt), + $self->_items_fee(%items_opt) ); + foreach my $item (@items) { my $description = $item->{'description'}; if ( $item->{'_is_discount'} and exists($item->{ext_description}[0]) ) { |