summaryrefslogtreecommitdiff
path: root/FS/FS/Template_Mixin.pm
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2012-10-11 15:15:48 -0700
committerIvan Kohler <ivan@freeside.biz>2012-10-11 15:15:48 -0700
commit671846c7bee35093d62a467236dddfe4706520b3 (patch)
treee85f01aabbeb4a7a17d1c28b57ecf9ad7e3cb4a8 /FS/FS/Template_Mixin.pm
parent47e67d9852be3ccab87d2993f063e920295d8e65 (diff)
parent4c886d5b7b118382dd021636ecb3de2ce275e7c1 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'FS/FS/Template_Mixin.pm')
-rw-r--r--FS/FS/Template_Mixin.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index d35fd55f2..146e95f1c 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2251,7 +2251,8 @@ sub _items_cust_bill_pkg {
$cust_pkg->h_labels_short($self->_date, undef, 'I')
unless $cust_bill_pkg->pkgpart_override; #don't redisplay services
- if ( $cust_pkg->locationnum != $cust_main->ship_locationnum ) {
+ if ( ! $cust_pkg->locationnum or
+ $cust_pkg->locationnum != $cust_main->ship_locationnum ) {
my $loc = $cust_pkg->location_label;
$loc = substr($loc, 0, $maxlength). '...'
if $format eq 'latex' && length($loc) > $maxlength;