View | Details | Raw Unified | Return to bug 5946
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (-7 / +14 lines)
Lines 557-568 function getElementsByClass( searchClass, domNode, tagName) { Link Here
557
557
558
function calcTotalRow(cell) {
558
function calcTotalRow(cell) {
559
559
560
    var bud_id =  cell.className;
560
    var string = cell.name;
561
    var pos = string.indexOf(",", 0);
562
    var bud_id = string.substring(0, pos);
561
    var val1 =    cell.value;
563
    var val1 =    cell.value;
562
    var remainingTotal =   document.getElementById("budget_est_"+bud_id).textContent;
564
    var remainingTotal =   document.getElementById("budget_est_"+bud_id);
563
    var remainingNew =0;
565
    var remainingNew =0;
564
    var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
566
    var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
565
    var arr =  getElementsByClass(bud_id);
567
    var arr =  getElementsByClass(cell.className);
566
568
567
    budgetTotal   =  budgetTotal.replace(/\,/, "");
569
    budgetTotal   =  budgetTotal.replace(/\,/, "");
568
570
Lines 594-600 function calcTotalRow(cell) { Link Here
594
596
595
function autoFillRow(bud_id) {
597
function autoFillRow(bud_id) {
596
598
597
    var remainingTotal =   document.getElementById("budget_est_"+bud_id).textContent;
599
    var remainingTotal =   document.getElementById("budget_est_"+bud_id);
598
    var remainingNew = new Number;
600
    var remainingNew = new Number;
599
    var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
601
    var budgetTotal  =  document.getElementById("budget_tot_"+bud_id ).textContent;
600
    var arr =  getElementsByClass("plan_entry_" + bud_id);
602
    var arr =  getElementsByClass("plan_entry_" + bud_id);
Lines 602-621 function autoFillRow(bud_id) { Link Here
602
    budgetTotal   =  budgetTotal.replace(/\,/, "");
604
    budgetTotal   =  budgetTotal.replace(/\,/, "");
603
    var qty = new Number;
605
    var qty = new Number;
604
// get the totals
606
// get the totals
607
    var novalueArr = new Array();
605
    for ( var i=0, len=arr.length; i<len; ++i ) {
608
    for ( var i=0, len=arr.length; i<len; ++i ) {
606
        remainingNew   +=   Math.abs (arr[i].value );
609
        remainingNew   +=   Math.abs (arr[i].value );
607
610
608
        if ( arr[i].value == 0 ) {
611
        if ( arr[i].value == 0 ) {
612
	    novalueArr[qty] = arr[i];
609
            qty += 1;
613
            qty += 1;
610
        }
614
        }
611
    }
615
    }
612
616
613
    remainingNew    =    Math.abs( budgetTotal) -  remainingNew   ;
617
    remainingNew    =    Math.abs( budgetTotal) -  remainingNew   ;
614
    var newCell = new Number (remainingNew / qty);
618
    var newCell = new Number (remainingNew / qty);
619
    var rest = new Number (remainingNew - (newCell.toFixed(2) * (novalueArr.length - 1)));
615
620
616
    for ( var i=0, len=arr.length; i<len; ++i ) {
621
    for (var i = 0; i<novalueArr.length; ++i) {
617
        if (  Math.abs(arr[i].value) == 0 ) {
622
         if (i == novalueArr.length - 1) {
618
            arr[i].value = newCell.toFixed(2) ;
623
             novalueArr[i].value = rest.toFixed(2);
624
         }else {
625
             novalueArr[i].value = newCell.toFixed(2);
619
        }
626
        }
620
    }
627
    }
621
628
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl (-2 / +1 lines)
Lines 88-94 YAHOO.util.Event.onAvailable("popmenu", function () { Link Here
88
88
89
<form method="post" id="Aform" name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
89
<form method="post" id="Aform" name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
90
<h3>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></h3>
90
<h3>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></h3>
91
91
<input type="hidden" name="authcat" value="<!-- TMPL_VAR NAME="authcat" -->" />
92
<!-- Budget Lines -->
92
<!-- Budget Lines -->
93
93
94
    <!-- TMPL_IF NAME="budget_lines" -->
94
    <!-- TMPL_IF NAME="budget_lines" -->
95
- 

Return to bug 5946