X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FTemplate_Mixin.pm;h=a5fb5579f021417523726398bbee98092058fed4;hp=fce1a3ffe1b9ad3a0de4c3db6506200f67bb2663;hb=c70ef4f4ec2a61b32c7e6aee40b3130cfd4381e5;hpb=c2e5e744cf218f9a388bc3073bfe5d9cc86b5ff3

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index fce1a3ffe..a5fb5579f 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3026,7 +3026,10 @@ sub _items_cust_bill_pkg {
     }) || $cust_main;
     $default_locationnum = $h_cust_main->ship_locationnum;
   } elsif ( $self->prospectnum ) {
-    $default_locationnum = $self->prospect_main->cust_location->locationnum;
+    my $cust_location = qsearchs('cust_location',
+      { prospectnum => $self->prospectnum,
+        disabled => '' });
+    $default_locationnum = $cust_location->locationnum if $cust_location;
   }
 
   my @b = (); # accumulator for the line item hashes that we'll return