projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
35ff521
)
rendering time with lots of locations, RT#80177
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 11 Apr 2018 00:54:43 +0000
(17:54 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 11 Apr 2018 00:54:43 +0000
(17:54 -0700)
FS/FS/Template_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Template_Mixin.pm
b/FS/FS/Template_Mixin.pm
index
8bfc51c
..
2194a3f
100644
(file)
--- 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 $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') ) {
# 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,
|| $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)
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');
}
$description = $self->mt('Usage charges');
}
- my $part_pkg = $cust_pkg->part_pkg;
-
$description .= $cust_bill_pkg->time_period_pretty( $part_pkg,
$description .= $cust_bill_pkg->time_period_pretty( $part_pkg,
- $
self->
agentnum );
+ $agentnum );
my @d = ();
my @seconds = (); # for display of usage info
my @d = ();
my @seconds = (); # for display of usage info