[freeside-commits] branch FREESIDE_4_BRANCH updated. e532e861dc162cab86905907e743ae15b315dca3

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  e532e861dc162cab86905907e743ae15b315dca3 (commit)
      from  f97797177af6a2456a8fed90372eca3f6d8f4049 (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 e532e861dc162cab86905907e743ae15b315dca3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 11 05:39:46 2016 -0800

    fix advanced package report, RT#40292, fallout from RT#20173

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0b60ed7..02e0e1e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -56,9 +56,11 @@ our ($disable_agentcheck, $DEBUG, $me, $import) = (0, 0, '[FS::cust_pkg]', 0);
 
 our $upgrade = 0; #go away after setup+start dates cleaned up for old customers
 
+our $cache_enabled = 0;
+
 sub _simplecache {
   my( $self, $hashref ) = @_;
-  if ( $hashref->{'pkg'} ) {
+  if ( $cache_enabled && $hashref->{'pkg'} && $hashref->{'plan'} ) {
     $self->{'_pkgpart'} = FS::part_pkg->new($hashref);
   }
 }
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 2e81a4a..11cd3a3 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -518,6 +518,7 @@ my $addl_from = qq{
            AND recur_option.optionname = 'recur_fee' )
 };
 
+local($FS::cust_pkg::cache_enabled) = 1; #for $cust_pkg->part_pkg
 my %all_pkgs = map { $_->custnum =>
                        [ $_->$pkgs_method({ select    => $select,
                                             addl_from => $addl_from,
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index f1e686a..dbd346d 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -44,7 +44,7 @@
                         },
                     sub { my $c = shift;
                           sprintf( $money_char.'%.2f',
-                                   $c->part_pkg->base_recur($c)
+                                   $c->base_recur
                                  );
                         },
                     sub { FS::part_pkg::freq_pretty(shift); },

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

Summary of changes:
 FS/FS/cust_pkg.pm               |    4 +++-
 httemplate/search/cust_main.cgi |    1 +
 httemplate/search/cust_pkg.cgi  |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)