X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=f57f14f0901a02f6b6c7bb055d811b322e192ffe;hp=b7d8b6e2d6b3c31dce3788b8558a3df24b569239;hb=a3f6785d22a743f03a805f537083ab57a20d5c6f;hpb=9a14161203e3fb6f4733d3554d66dcdc1486fe23

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]) ) {