Attachment #19786 for bug #7598

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




    return true;
}







//Function returns false if v is not a number (if maybenull is 0, it also returns an error if the number is 0)
function isNum(v,maybenull) {
    var n = new Number(v.value);

    if (result == '1') {
            return MSG_BUDGET_PARENT_ALLOCATION;
    } else if (result == '2') {
            return MSG_BUDGET_PERIOD_ALLOCATION;
    } else  {
            return false;
    }

Lines 3-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-3 / +3 lines)
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
4	<script type="text/javascript">	4	<script type="text/javascript">
5	//<![CDATA[	5	//<![CDATA[
6	var MSG_BUDGET_PARENT_ALLOCATION = _("- Fund amount exceeds parent allocation\n");	6	var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
7	var MSG_PARENT_BENEATH_BUDGET = _("- New budget-parent is beneath budget\n");	7	var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
		8	var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
8	//]]>	9	//]]>
9	</script>	10	</script>
10		11
11	-

Return to bug 7598

Lines 35-46 function isNull(f,noalert) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (-7 / +1 lines)
35	return true;	35	return true;
36	}	36	}
37		37
38
39
40
41
42
43
44	//Function returns false if v is not a number (if maybenull is 0, it also returns an error if the number is 0)	38	//Function returns false if v is not a number (if maybenull is 0, it also returns an error if the number is 0)
45	function isNum(v,maybenull) {	39	function isNum(v,maybenull) {
46	var n = new Number(v.value);	40	var n = new Number(v.value);
Lines 822-828 if ( newBudgetParent ) { url += '&parent_id=' + newBudgetParent}; Link Here
822	if (result == '1') {	816	if (result == '1') {
823	return MSG_BUDGET_PARENT_ALLOCATION;	817	return MSG_BUDGET_PARENT_ALLOCATION;
824	} else if (result == '2') {	818	} else if (result == '2') {
825	return MSG_BUDGET_PARENT_ALLOCATION;	819	return MSG_BUDGET_PERIOD_ALLOCATION;
826	} else {	820	} else {
827	return false;	821	return false;
828	}	822	}