[freeside-commits] branch master updated. 5123fd25380f308622f614f4ddb18001cdb0a4e2

[Mark Wells]

The branch, master has been updated
       via  5123fd25380f308622f614f4ddb18001cdb0a4e2 (commit)
      from  8b0f060e6c428f4d7639cff48fcae64cf254f9de (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 5123fd25380f308622f614f4ddb18001cdb0a4e2
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Mar 9 16:19:09 2015 -0700

    fix voiding of invoices containing taxes on fees, #33798, see also #32223

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e7b3b6f..378a521 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1283,9 +1283,6 @@ sub tables_hashref {
                           { columns    => [ 'billpkgnum' ],
                             table      => 'cust_bill_pkg_void',
                           },
-                          { columns    => [ 'pkgnum' ],
-                            table      => 'cust_pkg',
-                          },
                           { columns    => [ 'locationnum' ],
                             table      => 'cust_location',
                           },
diff --git a/FS/FS/cust_bill_pkg_tax_location_void.pm b/FS/FS/cust_bill_pkg_tax_location_void.pm
index a683227..7b79e6f 100644
--- a/FS/FS/cust_bill_pkg_tax_location_void.pm
+++ b/FS/FS/cust_bill_pkg_tax_location_void.pm
@@ -116,7 +116,7 @@ sub check {
     || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg_void', 'billpkgnum' )
     || $self->ut_number('taxnum') #cust_bill_pkg/tax_rate key, based on taxtype
     || $self->ut_enum('taxtype', [ qw( FS::cust_main_county FS::tax_rate ) ] )
-    || $self->ut_foreign_key('pkgnum', 'cust_pkg', 'pkgnum' )
+    || $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')

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

Summary of changes:
 FS/FS/Schema.pm                          |    3 ---
 FS/FS/cust_bill_pkg_tax_location_void.pm |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)