Merge remote branch 'kc/new/bug_5446' into kcmaster

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / js / acq.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index 0ec1460..326062d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -559,7 +559,7 @@ function calcTotalRow(cell) {
 
     var bud_id =  cell.className;
     var val1 =    cell.value;
-    var remainingTotal =   document.getElementById("budget_est_"+bud_id) ;
+    var remainingTotal =   document.getElementById("budget_est_"+bud_id).textContent;
     var remainingNew =0;
     var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
     var arr =  getElementsByClass(bud_id);
@@ -594,10 +594,10 @@ function calcTotalRow(cell) {
 
 function autoFillRow(bud_id) {
 
-    var remainingTotal =   document.getElementById("budget_est_"+bud_id) ;
+    var remainingTotal =   document.getElementById("budget_est_"+bud_id).textContent;
     var remainingNew = new Number;
     var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
-    var arr =  getElementsByClass(bud_id);
+    var arr =  getElementsByClass("plan_entry_" + bud_id);
 
     budgetTotal   =  budgetTotal.replace(/\,/, "");
     var qty = new Number;
@@ -679,6 +679,24 @@ function calcNeworderTotal(){
     return true;
 }
 
+// Calculates total amount in a suggestion
+
+function calcNewsuggTotal(){
+    //collect values
+    var quantity = new Number(document.getElementById('quantity').value);
+//    var currency = f.currency.value;
+    var currcode = new String(document.getElementById('currency').value);
+    var price   =  new Number(document.getElementById('price').value);
+    var exchangerate =  new Number(document.getElementById(currcode).value);
+
+    var total =  new Number(quantity*price*exchangerate);
+
+    document.getElementById('total').value = total.toFixed(2);
+    document.getElementById('price').value =  listprice.toFixed(2);
+    return true;
+}
+
+
 // ----------------------------------------
 //USED BY NEWORDEREMPTY.PL
 /*