[freeside-commits] freeside/FS/FS/cust_main Billing.pm,1.16,1.17

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/cust_main
In directory wavetail.420.am:/tmp/cvs-serv15922

Modified Files:
	Billing.pm 
Log Message:
don't lookup a geocode we don't need, RT#10093

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- Billing.pm	31 Oct 2010 02:47:28 -0000	1.16
+++ Billing.pm	31 Oct 2010 18:45:42 -0000	1.17
@@ -1225,9 +1225,13 @@
 
   local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
 
-  my $geocode = $self->geocode('cch');
-  $geocode = $cust_pkg->cust_location->geocode('cch')
-    if ( $conf->exists('tax-pkg_address') && $cust_pkg->locationnum );
+  my $geocode;
+  if (  $cust_pkg->locationnum && $conf->exists('tax-pkg_address') ) {
+    $geocode = $cust_pkg->cust_location->geocode('cch');
+  } else {
+    $geocode = $self->geocode('cch');
+  }
+
   my @taxes = ();
 
   my @taxclassnums = map { $_->taxclassnum }