[freeside-commits] branch master updated. e5011f030796de0913c98631ac089e9bcb6c9912

[Ivan]

The branch, master has been updated
       via  e5011f030796de0913c98631ac089e9bcb6c9912 (commit)
      from  98460903530ead429f608ba6fce4eac1a8ee3cf3 (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 e5011f030796de0913c98631ac089e9bcb6c9912
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 9 12:59:51 2012 -0700

    should fix
    
      Argument "" isn't numeric in numeric ne (!=) at /usr/local/share/perl/5.10.1/FS/Template_Mixin.pm line 2254.

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index d35fd55..146e95f 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;

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

Summary of changes:
 FS/FS/Template_Mixin.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)