[freeside-commits] branch FREESIDE_4_BRANCH updated. 5f7dbb0df2ef71723ae34fd151525994a3b82956

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  5f7dbb0df2ef71723ae34fd151525994a3b82956 (commit)
      from  c768181f5e2f4fd5ffcc02e504ce6fa6d73b3922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5f7dbb0df2ef71723ae34fd151525994a3b82956
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Oct 18 23:06:03 2016 -0700

    during upgrade, fix broken tax links on old voided invoices, #72777

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 0729816..5a1ac2b 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -386,6 +386,7 @@ sub upgrade_data {
     # reason / void_reason migration to reasonnum / void_reasonnum
     'cust_credit_void' => [],
     'cust_bill_void' => [],
+    # also fix some tax allocation records
     'cust_bill_pkg_void' => [],
 
     #duplicate history records
diff --git a/FS/FS/cust_bill_pkg_void.pm b/FS/FS/cust_bill_pkg_void.pm
index 991dd37..9bfd41f 100644
--- a/FS/FS/cust_bill_pkg_void.pm
+++ b/FS/FS/cust_bill_pkg_void.pm
@@ -13,6 +13,7 @@ use FS::cust_bill_pkg_fee;
 use FS::cust_bill_pkg_tax_location;
 use FS::cust_bill_pkg_tax_rate_location;
 use FS::cust_tax_exempt_pkg;
+use FS::Cursor;
 
 $me = '[ FS::cust_bill_pkg_void ]';
 $DEBUG = 0;
@@ -283,7 +284,6 @@ sub cust_bill_pkg_fee {
   qsearch( 'cust_bill_pkg_fee_void', { 'billpkgnum' => $self->billpkgnum } );
 }
 
-
 # _upgrade_data
 #
 # Used by FS::Upgrade to migrate to a new database.
@@ -293,6 +293,33 @@ sub _upgrade_data {  # class method
   warn "$me upgrading $class\n" if $DEBUG;
 
   $class->_upgrade_reasonnum(%opts);
+  my $error;
+  # fix voids with tax from before July 2013, when the taxable_billpkgnum
+  # field was added to the void table
+  my $search = FS::Cursor->new({
+    'table'   => 'cust_bill_pkg_tax_location_void',
+    'hashref' => { 'taxable_billpkgnum' => '' }
+  });
+  while (my $void = $search->fetch) {
+    # the history for the unvoided record should have the correct
+    # taxable_billpkgnum
+    my $num = $void->billpkgtaxlocationnum;
+    my $unvoid = qsearchs({
+      'table'   => 'h_cust_bill_pkg_tax_location',
+      'hashref' => { 'billpkgtaxlocationnum' => $num },
+      '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.";
+    }
+    if ($unvoid) {
+      $void->set('taxable_billpkgnum', $unvoid->taxable_billpkgnum);
+      $error = $void->replace;
+      die "billpkgtaxlocationnum $num: $error\n" if $error;
+    }
+  }
+
 }
 
 =back

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Upgrade.pm            |    1 +
 FS/FS/cust_bill_pkg_void.pm |   29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)