[freeside-commits] freeside/httemplate/edit cust_main.cgi, 1.95, 1.96

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv6374/httemplate/edit

Modified Files:
	cust_main.cgi 
Log Message:
do not attempt to assign a geocode to non us/ca addresses (RT 4857)

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main.cgi,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- cust_main.cgi	8 Feb 2009 02:05:25 -0000	1.95
+++ cust_main.cgi	19 Feb 2009 13:38:28 -0000	1.96
@@ -361,9 +361,14 @@
 
 % if ( $conf->exists('enable_taxproducts') ) {
 
-  if ( error || ship_error ) {
+  if ( ( error || ship_error ) &&
+       ( document.bottomform.elements['country'].value == 'CA' ||
+         document.bottomform.elements['country'].value == 'US'
+       )
+     )
+  {
 
-    var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['city'].value+";state="+document.bottomform.elements['state'].value+";zip="+document.bottomform.elements['zip'].value+";";
+    var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['city'].value+";state="+document.bottomform.elements['state'].value+";zip="+document.bottomform.elements['zip'].value+";country="+document.bottomform.elements['country'].value+";";
     // popup a chooser
     OLgetAJAX( url, update_geocode, 300 );