diff options
| author | ivan <ivan> | 2010-09-23 18:30:56 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-09-23 18:30:56 +0000 |
| commit | 7e841ad193316a390086c492c5ea090be58d9326 (patch) | |
| tree | 26b3b438bd6ca1e24e61930432c82193ef6d1fb1 | |
| parent | 809450eeedfb9fc86157587e135fd82c94c290fc (diff) | |
not sure if this is a fix or a workaround, hence the warning, RT#10024
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index d24221ebb..4fd8643ea 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -435,8 +435,8 @@ sub bill { next unless @cust_bill_pkg; #don't create an invoice w/o line items - warn "$me billing pass $pass\n". - Dumper(\@cust_bill_pkg)."\n" + warn "$me billing pass $pass\n" + #.Dumper(\@cust_bill_pkg)."\n" if $DEBUG > 2; if ( scalar( grep { $_->recur && $_->recur > 0 } @cust_bill_pkg) || @@ -643,8 +643,8 @@ sub calculate_taxes { local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG; - warn "$me calculate_taxes\n". - Dumper($self, $cust_bill_pkg, $taxlisthash, $invoice_time). "\n" + warn "$me calculate_taxes\n" + #.Dumper($self, $cust_bill_pkg, $taxlisthash, $invoice_time). "\n" if $DEBUG > 2; my @tax_line_items = (); @@ -717,12 +717,16 @@ sub calculate_taxes { #move the cust_tax_exempt_pkg records to the cust_bill_pkgs we will commit my %packagemap = map { $_->pkgnum => $_ } @$cust_bill_pkg; - warn Dumper(\%packagemap) if $DEBUG > 2; foreach my $tax ( keys %$taxlisthash ) { foreach ( @{ $taxlisthash->{$tax} }[1 ... scalar(@{ $taxlisthash->{$tax} })] ) { next unless ref($_) eq 'FS::cust_bill_pkg'; - warn $_->pkgnum."\n" if $DEBUG > 2; + unless ( $packagemap{$_->pkgnum} ) { + warn "WARNING: can't move cust_tax_exempt_pkg records for pkgnum". + $_->pkgnum. " - not in our line item list"; + next; + } + push @{ $packagemap{$_->pkgnum}->_cust_tax_exempt_pkg }, splice( @{ $_->_cust_tax_exempt_pkg } ); } |