X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_location.cgi;h=93311c5c3fec1b962f78c9b798b8c850e103a265;hb=2009d9cee8038aeff5b4313113fc23f546455cf5;hp=93ce32382ffd13ed895d4f3c6c0d4d7507cabe31;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git

diff --git a/httemplate/edit/cust_location.cgi b/httemplate/edit/cust_location.cgi
index 93ce32382..93311c5c3 100755
--- a/httemplate/edit/cust_location.cgi
+++ b/httemplate/edit/cust_location.cgi
@@ -17,20 +17,28 @@ ACTION="<% $p %>edit/process/cust_location.cgi" METHOD=POST>
 &>
 <& /elements/standardize_locations.html,
             'form'          => 'EditLocationForm',
-            'callback'      => 'document.EditLocationForm.submit();',
+            'callback'    => $conf->exists('tax_district_method')
+                              ? 'wa_state_tax_district()'
+                              : 'submit_continue()',
             'with_census'   => 1,
+            'with_census_functions' => 1,
 &>
+<script>
+  <& /elements/wa_state_tax_district.js &>
+
+  // wa_sate_tax_district() will call submit_continue() upon success,
+  //   or submit_abort() upon error
+  function submit_continue() {
+    document.EditLocationForm.submit();
+  }
+</script>
 </TABLE>
 
 <BR>
 <SCRIPT TYPE="text/javascript">
 function go() {
-% if ( FS::Conf->new->config('address_standardize_method') ) {
-  standardize_locations();
-% } else {
   confirm('Modify this service location?') &&
-    document.EditLocationForm.submit();
-% }
+    standardize_locations();
 }
 
 function submit_abort() {