summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-11-13 23:58:32 -0800
committerMark Wells <mark@freeside.biz>2016-11-13 23:58:32 -0800
commit12becc874109c0e063be8f7bfd1b0c68571e54c4 (patch)
tree3fa2fa3307c1fc36548e06a09baae8dc85c3458d
parentb97efa7ea7e8f10ea017f20a31ea48e7db8044e5 (diff)
fix upgrade issues with old voided tax records, #73360
-rw-r--r--FS/FS/cust_bill_pkg_tax_location.pm2
-rw-r--r--FS/FS/cust_bill_pkg_tax_location_void.pm2
-rw-r--r--FS/FS/cust_bill_pkg_void.pm6
3 files changed, 7 insertions, 3 deletions
diff --git a/FS/FS/cust_bill_pkg_tax_location.pm b/FS/FS/cust_bill_pkg_tax_location.pm
index 0e510005f..1717654a2 100644
--- a/FS/FS/cust_bill_pkg_tax_location.pm
+++ b/FS/FS/cust_bill_pkg_tax_location.pm
@@ -127,7 +127,7 @@ sub check {
|| $self->ut_number('pkgnum', 'cust_pkg', 'pkgnum' )
|| $self->ut_foreign_key('locationnum', 'cust_location', 'locationnum' )
|| $self->ut_money('amount')
- || $self->ut_foreign_key('taxable_billpkgnum', 'cust_bill_pkg', 'billpkgnum')
+ || $self->ut_foreign_keyn('taxable_billpkgnum', 'cust_bill_pkg', 'billpkgnum')
;
return $error if $error;
diff --git a/FS/FS/cust_bill_pkg_tax_location_void.pm b/FS/FS/cust_bill_pkg_tax_location_void.pm
index 7b79e6fa0..bb4a5afb0 100644
--- a/FS/FS/cust_bill_pkg_tax_location_void.pm
+++ b/FS/FS/cust_bill_pkg_tax_location_void.pm
@@ -119,7 +119,7 @@ sub check {
|| $self->ut_number('pkgnum', 'cust_pkg', 'pkgnum' )
|| $self->ut_foreign_key('locationnum', 'cust_location', 'locationnum' )
|| $self->ut_money('amount')
- || $self->ut_foreign_key('taxable_billpkgnum', 'cust_bill_pkg_void', 'billpkgnum')
+ || $self->ut_foreign_keyn('taxable_billpkgnum', 'cust_bill_pkg_void', 'billpkgnum')
;
return $error if $error;
diff --git a/FS/FS/cust_bill_pkg_void.pm b/FS/FS/cust_bill_pkg_void.pm
index 8bd80887e..604c615de 100644
--- a/FS/FS/cust_bill_pkg_void.pm
+++ b/FS/FS/cust_bill_pkg_void.pm
@@ -276,6 +276,7 @@ sub _upgrade_data { # class method
my $error;
# fix voids with tax from before July 2013, when the taxable_billpkgnum
# field was added to the void table
+ local $FS::Record::nowarn_classload = 1;
my $search = FS::Cursor->new({
'table' => 'cust_bill_pkg_tax_location_void',
'hashref' => { 'taxable_billpkgnum' => '' }
@@ -287,11 +288,14 @@ sub _upgrade_data { # class method
my $unvoid = qsearchs({
'table' => 'h_cust_bill_pkg_tax_location',
'hashref' => { 'billpkgtaxlocationnum' => $num },
+ 'extra_sql' => ' AND taxable_billpkgnum IS NOT NULL',
'order_by' => ' ORDER BY history_date DESC LIMIT 1'
});
if (!$unvoid) {
# should never happen
- die "billpkgtaxlocationnum $num: could not find pre-void history record to restore taxable_billpkgnum.";
+ # but should this be fatal? or wait until someone actually tries to
+ # use the record?
+ warn "billpkgtaxlocationnum $num: could not find pre-void history record to restore taxable_billpkgnum.";
}
if ($unvoid) {
$void->set('taxable_billpkgnum', $unvoid->taxable_billpkgnum);