Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / templates / webpages / gl / form_header.html

diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index d73380e..98bb8f0 100644 (file)
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -8,33 +8,20 @@ function updateTaxes(row)
 {
   var accno  = document.getElementById('accno_' + row);
   var taxkey = accno.options[accno.selectedIndex].value;
-  var reg = /--([0-9]*)/;
+  var reg = /^(.*?)--(\d*)$/;
   var found = reg.exec(taxkey);
-  var index = found[1];
-  index = parseInt(index);
-  var tax = 'taxchart_' + row;
-  var taxkeyposition = taxkey.lastIndexOf(found[0]);
-  var account = taxkey.substr(0, taxkeyposition);
+  var account = found[1];
+  var default_tax_id = found[2];
 
-  var xmlhttp;
-  if (window.XMLHttpRequest)
-  {// code for IE7+, Firefox, Chrome, Opera, Safari
-    xmlhttp=new XMLHttpRequest();
-  }
-  else
-  {// code for IE6, IE5
-    xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  xmlhttp.onreadystatechange=function()
-  {
-    if (xmlhttp.readyState==4 && xmlhttp.status==200)
-    {
-      var element = document.getElementById("taxchart_" + row);
-      element.innerHTML = xmlhttp.responseText;
-    }
-  }
-  xmlhttp.open("GET","gl.pl?action=get_tax_dropdown&accno=" + account + "&select_index=" + index,true);
-  xmlhttp.send();
+  $.ajax({
+    url: 'gl.pl?action=get_tax_dropdown',
+    data: { accno: account,
+            selected_tax_id: default_tax_id},
+    dataType: 'html',
+    success: function (new_html) {
+                                $("#taxchart_" + row).html(new_html);
+                              },
+  });
 };
 
   function copy_debit_to_credit() {