Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/cust_main.pm
index e4be849,7594fa8..671ad21
--- 1/FS/FS/cust_main.pm
--- 2/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@@ -93,8 -93,6 +93,8 @@@ our $skip_fuzzyfiles = 0
  
  our $ucfirst_nowarn = 0;
  
 +#this info is in cust_payby as of 4.x
 +#this and the fields themselves can be removed in 5.x
  our @encrypted_fields = ('payinfo', 'paycvv');
  sub nohistory_fields { ('payinfo', 'paycvv'); }
  
@@@ -3133,6 -3131,7 +3133,7 @@@ sub charge 
    my ( $setuptax, $taxclass );   #internal taxes
    my ( $taxproduct, $override ); #vendor (CCH) taxes
    my $no_auto = '';
+   my $separate_bill = '';
    my $cust_pkg_ref = '';
    my ( $bill_now, $invoice_terms ) = ( 0, '' );
    my $locationnum;
@@@ -3155,7 -3154,8 +3156,8 @@@
      $bill_now = exists($_[0]->{bill_now}) ? $_[0]->{bill_now} : '';
      $invoice_terms = exists($_[0]->{invoice_terms}) ? $_[0]->{invoice_terms} : '';
      $locationnum = $_[0]->{locationnum} || $self->ship_locationnum;
-   } else {
+     $separate_bill = $_[0]->{separate_bill} || '';
+   } else { # yuck
      $amount     = shift;
      $setup_cost = '';
      $quantity   = 1;
@@@ -3223,6 -3223,7 +3225,7 @@@
      'quantity'   => $quantity,
      'start_date' => $start_date,
      'no_auto'    => $no_auto,
+     'separate_bill' => $separate_bill,
      'locationnum'=> $locationnum,
    } );