summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeff <jeff>2008-12-23 20:35:36 +0000
committerjeff <jeff>2008-12-23 20:35:36 +0000
commit6d59750695aca810d463dcd8d92a4ad6a0138d84 (patch)
treeb33b7a54405a7453c5f3c923bb6aec6e89acbe64
parentaf7fa01c4148ae3616f08b0cfe81518a7b0cb5a2 (diff)
correct bad tax calculation
-rw-r--r--FS/FS/cust_main.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index c7bcf673a..77f9e4029 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2220,11 +2220,11 @@ sub bill {
warn "adding ". $listref_or_error->[1].
" as ". $listref_or_error->[0]. "\n"
if $DEBUG > 2;
- $tax{ $tax_object->taxname } += $listref_or_error->[1];
+ $tax{ $tax } += $listref_or_error->[1];
if ( $taxname{ $listref_or_error->[0] } ) {
- push @{ $taxname{ $listref_or_error->[0] } }, $tax_object->taxname;
+ push @{ $taxname{ $listref_or_error->[0] } }, $tax;
}else{
- $taxname{ $listref_or_error->[0] } = [ $tax_object->taxname ];
+ $taxname{ $listref_or_error->[0] } = [ $tax ];
}
}
@@ -2248,9 +2248,9 @@ sub bill {
# existing taxes
warn "adding $totname to taxed taxes\n" if $DEBUG > 2;
if ( exists( $totlisthash{ $totname } ) ) {
- push @{ $totlisthash{ $totname } }, $tax{ $tax_object->taxname };
+ push @{ $totlisthash{ $totname } }, $tax{ $tax };
}else{
- $totlisthash{ $totname } = [ $tot, $tax{ $tax_object->taxname } ];
+ $totlisthash{ $totname } = [ $tot, $tax{ $tax } ];
}
}
}
@@ -2269,7 +2269,7 @@ sub bill {
warn "adding taxed tax amount ". $listref_or_error->[1].
" as ". $tax_object->taxname. "\n"
if $DEBUG;
- $tax{ $tax_object->taxname } += $listref_or_error->[1];
+ $tax{ $tax } += $listref_or_error->[1];
}
#consolidate and create tax line items