[freeside-commits] branch master updated. 010c8080a423af31fe92082c271ad8b261450393

[Ivan]

The branch, master has been updated
       via  010c8080a423af31fe92082c271ad8b261450393 (commit)
      from  60dc16fe65ff92e3a1649c671476eed550bb0f79 (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 010c8080a423af31fe92082c271ad8b261450393
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Nov 11 20:39:42 2013 -0800

    add billco-account_num option, RT#22934

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4e34ef4..d0e7048 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1970,14 +1970,15 @@ sub print_csv {
 
   my $time = $opt{'time'} || time;
 
+  my $tracctnum = ''; #leaking out from billco-specific sections :/
   if ( $format eq 'billco' ) {
 
     my $account_num =
       $self->conf->config('billco-account_num', $cust_main->agentnum);
 
-    my $tracctnum = $account_num eq 'display_custnum'
-                      ? $cust_main->display_custnum
-                      : $opt{'tracctnum'};
+    $tracctnum = $account_num eq 'display_custnum'
+                   ? $cust_main->display_custnum
+                   : $opt{'tracctnum'};
 
     my $taxtotal = 0;
     $taxtotal += $_->{'amount'} foreach $self->_items_tax;
@@ -2232,7 +2233,7 @@ sub print_csv {
       $csv->combine(
         '',                     #  1 | N/A-Leave Empty            CHAR   2
         '',                     #  2 | N/A-Leave Empty            CHAR  15
-        $opt{'tracctnum'},      #  3 | Account Number             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

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

Summary of changes:
 FS/FS/cust_bill.pm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)