X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=098de848ec9673f7b2b9bc51cd629ffa3f2cd77b;hb=00bb047761ea320fb7f1a2b8e45820d6c539b3e0;hp=3fb70a5bf664bb58204254be6bb9a75ee7a8ef25;hpb=c2cf878f3c2c0e3fcd06f400a268d2cf9bd12eb8;p=freeside.git

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3fb70a5bf..098de848e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -361,16 +361,23 @@ function update_address(arg) {
 
 % if ( $conf->exists('enable_taxproducts') ) {
 
-  if ( ( error || ship_error ) &&
-       ( document.bottomform.elements['country'].value == 'CA' ||
-         document.bottomform.elements['country'].value == 'US'
+  if ( <% $taxpre %>error ) {
+
+    if ( document.bottomform.elements['<% $taxpre %>country'].value == 'CA' ||
+         document.bottomform.elements['<% $taxpre %>country'].value == 'US'
        )
-     )
-  {
+    {
+
+      var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['<% $taxpre %>city'].value+";state="+document.bottomform.elements['<% $taxpre %>state'].value+";zip="+document.bottomform.elements['<% $taxpre %>zip'].value+";country="+document.bottomform.elements['<% $taxpre %>country'].value+";";
+      // popup a chooser
+      OLgetAJAX( url, update_geocode, 300 );
+
+    } else {
+
+      document.bottomform.elements['geocode'].value = 'DEFAULT';
+      document.bottomform.submit();
 
-    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 );
+    }
 
   } else
 
@@ -476,9 +483,9 @@ function update_geocode() {
 
     //alert(what.options[what.selectedIndex].value);
     var argsHash = eval('(' + what.options[what.selectedIndex].value + ')');
-    document.bottomform.elements['city'].value = argsHash['city'];
-    document.bottomform.elements['state'].value = argsHash['state'];
-    document.bottomform.elements['zip'].value = argsHash['zip'];
+    document.bottomform.elements['<% $taxpre %>city'].value = argsHash['city'];
+    document.bottomform.elements['<% $taxpre %>state'].value = argsHash['state'];
+    document.bottomform.elements['<% $taxpre %>zip'].value = argsHash['zip'];
     document.bottomform.elements['geocode'].value = argsHash['geocode'];
 
   }
@@ -690,6 +697,7 @@ die "access denied"
 
 my $conf = new FS::Conf;
 
+my $taxpre = $conf->exists('tax-ship_address') ? 'ship_' : '';
 #get record
 
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart, $saved_domsvc);