use Carp;
use List::Util qw( sum min );
use Text::CSV_XS;
-use FS::Record qw( qsearch qsearchs dbh );
+use FS::Record qw( qsearch qsearchs dbh fields );
use FS::cust_pkg;
use FS::cust_bill_pkg_detail;
use FS::cust_bill_pkg_display;
}
- $error = $self->delete;
+ $error = $self->delete( skip_update_cust_bill_charged=>1 );
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
$self->billpkgnum
);
- $self->scalar_sql("INSERT INTO cust_bill_pkg_detail_void
- SELECT * $from_cust_bill_pkg_detail",
+ my $fields = join(', ', fields('cust_bill_pkg_detail_void') );
+
+ $self->scalar_sql("INSERT INTO cust_bill_pkg_detail_void ($fields)
+ SELECT $fields $from_cust_bill_pkg_detail",
$self->billpkgnum
);
sub delete {
my $self = shift;
+ my %opt = @_;
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
}
}
+ unless ( $opt{skip_update_cust_bill_charged} ) {
+
+ #fix the invoice amount
+
+ my $cust_bill = $self->cust_bill;
+ my $charged = $cust_bill->charged - $self->setup - $self->recur;
+ $charged = sprintf('%.2f', $charged + 0.00000001 );
+ $cust_bill->charged( $charged );
+
+ #not adding a cc surcharge, but this override lets us modify charged
+ $cust_bill->{'Hash'}{'cc_surcharge_replace_hack'} = 1;
+
+ my $error = $cust_bill->replace;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+
+ }
+
my $error = $self->SUPER::delete(@_);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
# Duplicates can be identified by billpkgtaxlocationnum column.
my $self = shift;
- return unless $self->pkgnum;
+
+ my $search_selector;
+ if ( $self->pkgnum ) {
+
+ # For taxes applied to normal billing items
+ $search_selector =
+ ' cust_bill_pkg_tax_location.pkgnum = '
+ . dbh->quote( $self->pkgnum );
+
+ } elsif ( $self->feepart ) {
+
+ # For taxes applied to fees, when the fee is not attached to a package
+ # i.e. late fees, billing events fees
+ $search_selector =
+ ' cust_bill_pkg_tax_location.taxable_billpkgnum = '
+ . dbh->quote( $self->billpkgnum );
+
+ } else {
+ warn "_pkg_tax_list() unhandled case breaking taxes into sections";
+ warn "_pkg_tax_list() $_: ".$self->$_
+ for qw(pkgnum billpkgnum feepart);
+ return;
+ }
map +{
billpkgtaxlocationnum => $_->billpkgtaxlocationnum,
' WHERE '.
' cust_bill_pkg.invnum = ' . dbh->quote( $self->invnum ) .
' AND '.
- ' cust_bill_pkg_tax_location.pkgnum = ' . dbh->quote( $self->pkgnum ),
+ $search_selector
});
}