Attachment #110825 for bug #26217

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

Lines 156-162 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-1 lines)
156	uncheckbox( form, ordernumber );	156	uncheckbox( form, ordernumber );
157	});	157	});
158	});	158	});
159	var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!");
160	</script>	159	</script>
161	[% Asset.js("js/acq.js") \| $raw %]	160	[% Asset.js("js/acq.js") \| $raw %]
162	[% END %]	161	[% END %]





[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/acq.js") | $raw %]
    <script>
        var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
        var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
        var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
    </script>

    [% Asset.js("js/acq.js") | $raw %]
    [% IF op == 'add_form' %]
        <script>
        //<![CDATA[




function uncheckbox(form, field) {
    var price = new Number(form.elements['price' + field].value);
    var tmpprice = "";
    var errmsg = __("ERROR: Price is not a valid number, please check the price and try again!");
    if (isNaN(price)) {
        alert(errmsg);
        for(var i=0; i<form.elements['price' + field].value.length; ++i) {

    var result = eval ( xmlhttp.responseText );

    if (result == '1') {
            return "- " + __("Fund amount exceeds parent allocation") + "\n";
    } else if (result == '2') {
            return "- " + __("Fund amount exceeds period allocation") + "\n";
    } else  {
            return false;
    }

    var result = eval ( xmlhttp.responseText );

    if (result == '1') {
            return "- " + __("New budget-parent is beneath budget") + "\n";
//     } else if (result == '2') {
//            return "- New budget-parent has insufficent funds\n";
//     } else  {
- 

Return to bug 26217

Lines 449-461 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-7 lines)
449		449
450	[% MACRO jsinclude BLOCK %]	450	[% MACRO jsinclude BLOCK %]
451	[% Asset.js("js/acq.js") \| $raw %]	451	[% Asset.js("js/acq.js") \| $raw %]
452	<script>
453	var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
454	var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
455	var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
456	</script>
457
458	[% Asset.js("js/acq.js") \| $raw %]
459	[% IF op == 'add_form' %]	452	[% IF op == 'add_form' %]
460	<script>	453	<script>
461	//<![CDATA[	454	//<![CDATA[

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/acq.js (-5 / +4 lines)
4	function uncheckbox(form, field) {	4	function uncheckbox(form, field) {
5	var price = new Number(form.elements['price' + field].value);	5	var price = new Number(form.elements['price' + field].value);
6	var tmpprice = "";	6	var tmpprice = "";
7	var errmsg = MSG_INVALIDPRICE;	7	var errmsg = __("ERROR: Price is not a valid number, please check the price and try again!");
8	if (isNaN(price)) {	8	if (isNaN(price)) {
9	alert(errmsg);	9	alert(errmsg);
10	for(var i=0; i<form.elements['price' + field].value.length; ++i) {	10	for(var i=0; i<form.elements['price' + field].value.length; ++i) {
Lines 304-312 if ( newBudgetParent ) { url += '&parent_id=' + newBudgetParent}; Link Here
304	var result = eval ( xmlhttp.responseText );	304	var result = eval ( xmlhttp.responseText );
305		305
306	if (result == '1') {	306	if (result == '1') {
307	return MSG_BUDGET_PARENT_ALLOCATION;	307	return "- " + __("Fund amount exceeds parent allocation") + "\n";
308	} else if (result == '2') {	308	} else if (result == '2') {
309	return MSG_BUDGET_PERIOD_ALLOCATION;	309	return "- " + __("Fund amount exceeds period allocation") + "\n";
310	} else {	310	} else {
311	return false;	311	return false;
312	}	312	}
Lines 338-344 function checkBudgetParent(budgetId, newBudgetParent) { Link Here
338	var result = eval ( xmlhttp.responseText );	338	var result = eval ( xmlhttp.responseText );
339		339
340	if (result == '1') {	340	if (result == '1') {
341	return MSG_PARENT_BENEATH_BUDGET;	341	return "- " + __("New budget-parent is beneath budget") + "\n";
342	// } else if (result == '2') {	342	// } else if (result == '2') {
343	// return "- New budget-parent has insufficent funds\n";	343	// return "- New budget-parent has insufficent funds\n";
344	// } else {	344	// } else {
345	-