[freeside-commits] branch master updated. 8c720e8a4aae1937cf837009c864aebc64faa5b4

[Mark Wells]

The branch, master has been updated
       via  8c720e8a4aae1937cf837009c864aebc64faa5b4 (commit)
      from  b7ef80d945a1d5919e6f25437cf765e6355e5cb5 (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 8c720e8a4aae1937cf837009c864aebc64faa5b4
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Mar 31 13:38:15 2015 -0700

    remove unnecessary methods in 4.x, #26828

diff --git a/FS/FS/FeeOrigin_Mixin.pm b/FS/FS/FeeOrigin_Mixin.pm
index 4eaf9b8..8bd9acd 100644
--- a/FS/FS/FeeOrigin_Mixin.pm
+++ b/FS/FS/FeeOrigin_Mixin.pm
@@ -110,13 +110,7 @@ sub cust_bill { '' }
 
 sub cust_pkg { '' }
 
-# stubs; remove in 4.x
-
-sub part_fee {
-  my $self = shift;
-  FS::part_fee->by_key($self->feepart);
-}
-
+# still necessary in 4.x; can't FK the billpkgnum because of voids
 sub cust_bill_pkg {
   my $self = shift;
   $self->billpkgnum ? FS::cust_bill_pkg->by_key($self->billpkgnum) : '';
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4def528..be5bdea 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1750,7 +1750,7 @@ sub unsuspend {
 
   if ( $reason ) {
     if ( $reason->unsuspend_pkgpart ) {
-      #warn "Suspend reason '".$reason->reason."' uses deprecated unsuspend_pkgpart feature.\n"; # in 4.x
+      warn "Suspend reason '".$reason->reason."' uses deprecated unsuspend_pkgpart feature.\n";
       my $part_pkg = FS::part_pkg->by_key($reason->unsuspend_pkgpart)
         or $error = "Unsuspend package definition ".$reason->unsuspend_pkgpart.
                     " not found.";
diff --git a/FS/FS/cust_pkg_reason_fee.pm b/FS/FS/cust_pkg_reason_fee.pm
index e5cc829..1155c15 100644
--- a/FS/FS/cust_pkg_reason_fee.pm
+++ b/FS/FS/cust_pkg_reason_fee.pm
@@ -142,12 +142,6 @@ sub cust_pkg {
   $self->cust_pkg_reason->cust_pkg;
 }
 
-#stub - remove in 4.x
-sub cust_pkg_reason {
-  my $self = shift;
-  FS::cust_pkg_reason->by_key($self->pkgreasonnum);
-}
-
 =head1 SEE ALSO
 
 L<FS::FeeOrigin_Mixin>, L<FS::cust_pkg_reason>, L<part_fee>

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

Summary of changes:
 FS/FS/FeeOrigin_Mixin.pm     |    8 +-------
 FS/FS/cust_pkg.pm            |    2 +-
 FS/FS/cust_pkg_reason_fee.pm |    6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)