diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-11-15 03:10:32 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-11-15 03:10:32 -0600 |
| commit | 8568f687b70154d27c32fe16b0d018420807ded1 (patch) | |
| tree | 9d92bdc78053d4ee3f76eee68667cda339832b2c /FS | |
| parent | ca870678fbcc49f24e3ccbba899c974938c77336 (diff) | |
| parent | 79c4a2f57e660defff2eb03d1f5c8ad7e590272b (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_bill_pkg_tax_location.pm | 2 | ||||
| -rw-r--r-- | FS/FS/cust_bill_pkg_tax_location_void.pm | 2 | ||||
| -rw-r--r-- | FS/FS/cust_bill_pkg_void.pm | 6 |
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 7c67c2df8..4a641bec6 100644 --- a/FS/FS/cust_bill_pkg_tax_location.pm +++ b/FS/FS/cust_bill_pkg_tax_location.pm @@ -125,7 +125,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 9bfd41f09..2cbfa02d3 100644 --- a/FS/FS/cust_bill_pkg_void.pm +++ b/FS/FS/cust_bill_pkg_void.pm @@ -296,6 +296,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' => '' } @@ -307,11 +308,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); |