[freeside-commits] branch master updated. 50434de151ec3d79f6b397d0f0714b58885e80ec

[Ivan Kohler]

The branch, master has been updated
       via  50434de151ec3d79f6b397d0f0714b58885e80ec (commit)
      from  35ff521568f17c86d58c19c2cd945cf4b93d46a1 (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 50434de151ec3d79f6b397d0f0714b58885e80ec
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Apr 10 17:54:43 2018 -0700

    rendering time with lots of locations, RT#80177

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 8bfc51cf1..2194a3fa5 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3284,6 +3284,8 @@ sub _items_cust_bill_pkg {
 
   my $cust_main = $self->cust_main;#for per-agent cust_bill-line_item-ate_style
 
+  my $agentnum = $self->agentnum;
+
   # for location labels: use default location on the invoice date
   my $default_locationnum;
   if ( $conf->exists('invoice-all_pkg_addresses') ) {
@@ -3433,7 +3435,7 @@ sub _items_cust_bill_pkg {
             || $cust_bill_pkg->recur_show_zero;
 
           $description .= $cust_bill_pkg->time_period_pretty( $part_pkg,
-                                                              $self->agentnum )
+                                                              $agentnum )
             if $part_pkg->is_prepaid #for prepaid, "display the validity period
                                      # triggered by the recurring charge freq
                                      # (RT#26274)
@@ -3530,10 +3532,8 @@ sub _items_cust_bill_pkg {
             $description = $self->mt('Usage charges');
           }
 
-          my $part_pkg = $cust_pkg->part_pkg;
-
           $description .= $cust_bill_pkg->time_period_pretty( $part_pkg,
-                                                              $self->agentnum );
+                                                              $agentnum );
 
           my @d = ();
           my @seconds = (); # for display of usage info

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

Summary of changes:
 FS/FS/Template_Mixin.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)